Openshift changes
Merge Al-Fikri

relevant
Open
Merge branch 'master' of https://github.com/talhaobject90/Al-Fikri