am bcc7c845: Merge changes I9abd00af,Id0e75f71

* commit 'bcc7c84560d76a8d415ac0ae48bc7075069f2831':
  Upgrade to OpenSSL 1.0.1h
  Use numbering for patch orders