Clean up variables
Merge branch 'master' of https://github.com/andrewklau/openshift-galera-mariadb