Merge r567377 from 2021Q1 to RELEASE_13_0_0.

r567285 was used for the tag as it was the last revision of the tree
for RC1 package builds.  However, an important update to address
issues with USB on the RPI4 followed afterward, and as such, did not
make it into the tag.

Although technically tags should not change after they are created,
too many other changes have happened in the 2021Q1 branch that may
potentially interfere with the state of the 13.0-RELEASE cycle.

So, I am merging this change to the RELEASE_13_0_0 tag with my re@
hat on.

Reported by:	manu
Approved by:	re (implicit)
Approved by:	portmgr (implicit, re blanket)
Sponsored by:	Rubicon Communications, LLC ("Netgate")