Use erb in yml config files
Merge branch 'master' into openshift
Use erb in yml config files with openshift