Merge "Move MySQL settings out of puppet/controller.yaml"