Fix for FPM/eventports/catch_workers_output (DATASET-927).
Merge branch 'joyent/feature/miscfix/2013Q2' into joyent/release/2013Q2
Update joyent and wip