Attempt to fix opencv by working around DATASET-931
PgSQL 9.3 needs the user to have a valid shell
Merge branch 'joyent/feature/miscfix/2013Q3' into joyent/release/2013Q3
Update wip