Fix issues introduced in puppetlabs/puppetlabs-mysql#612

The regex updates caused failures in some places where it previously
(correctly) worked.
Merge pull request #623 from mhaskel/FM-2111

Fix issues introduced in puppetlabs/puppetlabs-mysql#612