Merge "Remove galera/mysql stuff from controllers"