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
Merge pull request #5813 from sztsian/bz1073725

Merged by openshift-bot
Bug 1160770 - consider CNAMEs when checking last access
Perf Improvement?
Merge pull request #5928 from danmcp/master

Merged by openshift-bot
sni-proxy: have restart re-create conf

"service openshift-sni-proxy start" caused haproxy conf to be re-created
according to the plugin conf file, but not a restart. This change causes
oo-rebuild-haproxy-sni-proxy to be run either way.

Bug 1161135 - openshift-sni-proxy restart command needs call
'oo-rebuild-haproxy-sni-proxy' function
https://bugzilla.redhat.com/show_bug.cgi?id=1161135
Merge pull request #5930 from sosiouxme/bz1161135-openshift-sni-proxy

Merged by openshift-bot
remove old upgrade logic
Bug 1160752 - Make apache-vhost more atomic

* Write one buffer to file rather than a number of write
* Truncate conf files rather than removing them to ease up httpd
  failures on restart
* Have watchman XXX plugin clean up "deleted" configurations
Merge pull request #5931 from bparees/clear_jenkins_upgrade

Merged by openshift-bot
Bug 1160752 - Add Watchman plugin to clean up vhost configurations
Revert "bz1151744 - wrap the wait for reload to finish inside of the lockfile"

This reverts commit dc07a6d177263a128f9b1506db9a7a20e64df451.
Revert "bz1147054 - use common lockfile"

This reverts commit 1cab19a4a88b0717b5199fcf85d148217ff198ca.
Bug 1160752 - Make Watchman frontend cleanup period configurable
Merge pull request #5932 from jwhonce/bug/1160752

Merged by openshift-bot
Bug 1160494 - Protect Ops stop_gear from cartridge errors
Bug 1160861 - Prevent both frontends installed at same time