Fixed wildfly cartridge name in cucumber tests
Merge pull request #5844 from abhgupta/abhgupta-dev

Merged by openshift-bot
bz1147054 - use common lockfile
Merge pull request #5842 from rajatchopra/master

Merged by openshift-bot
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 1141922
Merge pull request #5848 from lnader/master

Merged by openshift-bot
Bug 1145132 - Domain validation fails when adding size due to previously removed size