Backport lang/ghc7 fixes from trunk.
Merge branch 'joyent/feature/miscfix/2014Q1' into joyent/release/2014Q1
Update 'joyent' submodule.