Fix Rhino VM (DATASET-1025)
Add projects to SMF (DATASET-1027)
Merge branch 'joyent/feature/miscfix/2014Q1' into joyent/release/2014Q1
Update wip