Backport proftpd+pgsql fix from trunk.
PKG_USERS fix.
Merge branch 'joyent/feature/miscfix/2013Q3' into joyent/release/2013Q3
Update 'joyent' and 'wip' submodules.
Update 'joyent' and 'wip' submodules.
Merge branch 'joyent/release/2013Q3' into joyent/release/2013Q3_sngl