Port of a few Java updates
Port of unexpected server extension mechanism, including special case for Supported Elliptic Curves
Add some more Verisign OIDs
Add ECDHE_ECDSA CCM ciphersuites from RFC 7251
Merge remote-tracking branch 'upstream/master'