Bug 1144175
Bugzilla link https://bugzilla.redhat.com/show_bug.cgi?id=1144175
Added a configuration option for a timeout where the console waits for several background requests to the broker.
Fixed digit regex check and added sanity check to ensure timeout is not 0
Updated call in console/app/controllers/settings_controller.rb to also use the configured timeout
Fixed typo in regex
Refined validity check to properly check strings and integers
Fixed wildfly cartridge name in cucumber tests
bz1147054 - use common lockfile
Merge pull request #5842 from rajatchopra/master

Merged by openshift-bot
Minor errors in documentation
Merge pull request #5845 from mfojtik/wildfly_test_fix

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-node] release [1.31.3-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.31.4-1].
Automatic commit of package [openshift-origin-broker-util] release [1.30.3-1].
Automatic commit of package [openshift-origin-node-util] release [1.30.2-1].
Bug 1146112 - Added 401 to default expected status codes on health check. This will allow for Basic Auth applications to work in scaled mode.
Also provided ability for admins and users to change this and the health check URI values using environment variables.

Bug 1146112 - Can now set http-check status codes and GET uri via ENV vars

Bug 1146112 - replacing a line that was removed by accident

Bug 1146112 - Control script will check for user defined haproxy.cnf variables and set them

Bug 1146112 - No need for ternary operator here

Bug 1146112 - Per bparees: This came up on the bug scrum and there was agreement that we should accept 401 by default, can you update this to include 401 as part of the default status code list?

Bug 1146112 - Changed to double quotes for default values

Bug 1146112 - Fixing more syntax issues
Bug 1141922
Merge pull request #5848 from lnader/master

Merged by openshift-bot
v2_cart_model: allow archiving of destroyed gears

Adds cart model logic and two node config options to allow admins to
enable archiving of gears as they are destroyed, and to specify the
directory for archiving the gears.

Enterprise bug: 1092045
https://bugzilla.redhat.com/show_bug.cgi?id=1092045
Preventing rollback for PatchUserEnvVarsOp in case of gear creation
broker/node: Add parameter for gear destroy to signal part of gear creation
Enhanced code formatiing