Merge branch '16-openshift-env-not-taken-in-account-since-version-2-2-0' into 'master'

Resolve "openshift.env not taken in account since version 2.2.0"

Closes #16

See merge request to-be-continuous/openshift!40