BZ 1078787 - merge pull request, add env var to disable openshift managed server