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.
Jenkins cart: Add "unzip" dependency

The `bin/install` script depends on `unzip` being in the path, so the
specfile for this package should Require the `unzip` package.

Enterprise bug 1136706
https://bugzilla.redhat.com/show_bug.cgi?id=1136706
Merge pull request #5914 from dobbymoodge/BZ1136706

Merged by openshift-bot
Fix malformed ENV VARs in Cron

Bug 1157830 - https://bugzilla.redhat.com/show_bug.cgi?id=1157830
add unit test function for bz 1073725
Specifically require AsciiDoctor 0.1.4 to solve template error
Merge pull request #5916 from nhr/m4_docs_gen_fix

Merged by openshift-bot
bz 1116750
fix the description of command "aliases"
Merge pull request #5915 from VojtechVitek/bug_1157830

Merged by openshift-bot
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 #5917 from sztsian/master

Merged by openshift-bot
make the default crt/key/chain file to be configurable in vhost template
for custom certs; chain file is the same as ssl file
Merge pull request #5921 from rajatchopra/master

Merged by openshift-bot
Bug 1158737 - exposes DISABLE_HA on broker
Fixes bz1158773 - openshift-routing-daemon always return success...

This patch rewrites the services script in ruby. Doing so allows us to remove
the multiple layers of wrapper scripts.
Bug 1158737 - exposes the "ha" attribute on the "application" rest endpoint
Merge pull request #5923 from calfonso/bz1158773

Merged by openshift-bot