No need to include mysql bl3.mk ourselves.
Convert to MYSQL_VERSION.
Backport stud SMF from trunk.
Merge branch 'joyent/feature/miscfix/2014Q2' into joyent/release/2014Q2
Merge branch 'joyent/feature/pbulkmulti/2014Q2' into joyent/release/2014Q2
Update 'joyent' and 'wip' submodules.