Fix openshift
Merge branch 'feature/mariadb-support' into develop