OS-2257 unusable SSL libraries should have different names in the platform
Reset the tree again to be the same as the upstream.

This reverts commit e34de56b28c2a0bfc442bed551b65474f49a8f71.

Conflicts:
	curl/Makefile
Merge branch 'master' of git://github.com/joyent/illumos-extra into ec