Backport PKG_USERS fixes.
Backport zsh build fix.
Fix multiarch install.
Merge branch 'joyent/feature/miscfix/2013Q3' into joyent/release/2013Q3
Merge branch 'joyent/feature/multiarch/2013Q3' into joyent/release/2013Q3
Change CONFLICTS to support our compat packages.
Merge branch 'joyent/feature/miscfix/2013Q3' into joyent/release/2013Q3
Update 'joyent' submodule.