Do not poison build flags with mysql-client bl3 dirs.
Merge branch 'joyent/feature/miscfix/2013Q1' into joyent/release/2013Q1