The database backends are not mutually exclusive. For the sake of binary packages, use PKG_OPTIONS_NONEMPTY_SETS instead.
Merge remote-tracking branch 'origin/joyent/feature/miscfix/2013Q3' into joyent/release/2013Q3
Update joyent and wip