more merge fixes.

This brings the code almost entirely in line with the puppetlabs repo. Just with the mysql::onfig_template parameter added