Make sure www/ap-php is built with ZTS enabled or disabled properly
(DATASET-1041).
Backport security/openssl 1.0.1h from trunk.
Merge branch 'joyent/feature/miscfix/2014Q1' into joyent/release/2014Q1

Conflicts:
	security/openssl/Makefile
	security/openssl/distinfo
	security/openssl/patches/patch-Makefile.org
	security/openssl/patches/patch-apps_Makefile
	security/openssl/patches/patch-tools_Makefile