Pull in misc fixes from trunk.
Merge branch 'joyent/feature/miscfix/2013Q4' into joyent/release/2013Q4
Update 'joyent' submodule.
Update joyent and wip
Merge remote-tracking branch 'upstream/joyent/release/2013Q4' into joyent/release/2013Q4