Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Adds test cases for openssl EC improvements
  Adds better handling of EC keys: OPENSSL_KEYTYPE_EC