Merge branch 'joyent/feature/multiarch/trunk' into joyent/release/trunk
Merge branch 'joyent/feature/pbulkmulti/trunk' into joyent/release/trunk
Add 'joyent' and 'wip' submodules.