Multiarch fixes for devel/zlib
Backport phraseanet fix from trunk.
Merge branch 'joyent/feature/pbulkmulti/trunk' into joyent/release/trunk
Merge branch 'joyent/feature/multiarch/trunk' into joyent/release/trunk