Cleaning up for Rubocop...not my mess though :)
Merge branch 'COOK-4116' of github.com:shakie/mysql into COOK-4116