Attempted to fix open shift configuration
Merge branch 'master' into develop