Fix sed expression for the non-DESTDIR case.
Use MYSQL_VERSION.
Merge branch 'joyent/feature/miscfix/2014Q2' into joyent/release/2014Q2
Merge branch 'joyent/feature/pbulkmulti/2014Q2' into joyent/release/2014Q2