Merge mysql55 module into mysql

This also removes the default for services.mysql.package, as this should
not generally be updated automatically if we change the mysql attribute