MFH: r477402 r477403

r477402:
In preparation for applying security patches, switch to grouping of
patches per site as suggested by mat@.

Suggested by: mat@
Differential Revision: https://reviews.freebsd.org/D16718

r477402 needs to be merged as well in order for r477403 to merge
properly.

r477403:
Chase net/wpa_supplicant r477202 and base contrib/wpa r337819.

WPA: Ignore unauthenticated encrypted EAPOL-Key data

Though hostapd is technically not vulnerable, the mitigation for
CVE-2018-14526 does apply cleanly, therefore it is applied to maintain
consistency with net/wpa_supplicant and wpa in base.

Approved by: leres@
Differential Revision: https://reviews.freebsd.org/D16718

Approved by: portmgr (miwi@)