Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-mysql

Conflicts:
	manifests/config.pp
	manifests/params.pp
Merge branch 'master' of https://github.com/olindata/puppetlabs-mysql

Conflicts:
	manifests/config.pp
	manifests/params.pp