Backport pgbouncer update and SMF manifest
Add project support to Nginx SMF
Update joyent and wip
Merge branch 'joyent/feature/miscfix/2014Q1' into joyent/release/2014Q1