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
Kill out-of-memory gears more aggressively to reduce downtime

This change does a few things differently:

* Make multiple attempts when reading or writing cgroup
  data, to get around lock contention.  Also, handle
  exceptions better in this process

* Avoid calling force stop on the gear, because this
  involves other possible locking problems, and almost
  never works on an OOM gear, even when we bump the memory
  limit.  This also eliminates the time window between
  stopped and started states where someone/something could
  execute a conflicting state change.

* Send kill signals before we bump memory, so that the
  existing processes should immediately start cleaning
  up when the memory limit is bumped, without doing
  anything else like accepting more connections.
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 1158737 - exposes DISABLE_HA on broker
Bug 1158737 - exposes the "ha" attribute on the "application" rest endpoint
Merge pull request #5924 from fabianofranz/bugs/1158737

Merged by openshift-bot
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
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