MFC r264620:
Fix typo.
MFC: 264174

Speed up the lookup of interfaces when there are a large number
of them, such in a system with a large number of VLANs.

Submitted by: Nick Rogers
MFH (r264691): merge upstream patch for EC calculation bug
MFC r260689 (partial):
  Remove 'of course' statement from upgrading note.

Sponsored by:	The FreeBSD Foundation
Merge remote-tracking branch 'freebsd/stable/10' into hardened/10/aslr