Correctly merge env edits after background upates#2407

openshift-merge-robot merged 1 commit intoopenshift:masteropenshift/origin-web-console:masterfrom

spadgett:edit-env-background-updatespadgett/origin-web-console:edit-env-background-updateCopy head branch name to clipboard