Switch to joyent/openjdk7
Merge branch 'joyent/feature/miscfix/trunk' into joyent/release/trunk
Update 'joyent' submodule.