bz 1073725
https://bugzilla.redhat.com/show_bug.cgi?id=1073725
Test if the env exists before reporting exceeded USER_VARIABLE_MAX_COUNT. If all the env exists, just update them, otherwise report the error
add unit test function for bz 1073725
Merge branch 'master' of https://github.com/openshift/origin-server into bz1073725
Merge branch 'bz1073725' of https://github.com/sztsian/origin-server into bz1073725
Bug 1160652 - Set defaults for the new crt/key/chain apache vhost plugin configuration
Merge pull request #5926 from brenton/BZ1160652

Merged by openshift-bot
Merge pull request #5813 from sztsian/bz1073725

Merged by openshift-bot