OS-2215 curl uses LD_LIBRARY_PATH to the proto area
Merge branch 'master' of git://github.com/joyent/illumos-extra into ec