Fix SMF by removing instance definition (DATASET-987)
MySQL SMF fixes.
Merge branch 'joyent/feature/smf/2013Q4' into joyent/release/2013Q4