Merge branch 'trunk' into joyent/feature/pbulkmulti/trunk
Convert more packages to multi-mysql support.
Merge branch 'joyent/feature/pbulkmulti/trunk' into joyent/release/trunk