Remove #if PHP_VERSION_ID version checks
Merge branch 'PHP-5.6'

* PHP-5.6:
  Remove #if PHP_VERSION_ID version checks

Conflicts:
	ext/openssl/xp_ssl.c