Bug 1146108 - display unique name on cartridge if there is another cart with the same display name
Merge pull request #5836 from jwforres/bug_1146108_show_unique_cart_name

Merged by openshift-bot
Better error messages around no nodes available
Merge pull request #5837 from danmcp/master

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-admin-console] release [1.26.2-1].
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.30.2-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.31.3-1].
Automatic commit of package [rubygem-openshift-origin-console] release [1.31.3-1].
use regex handling for jboss string
Merge pull request #5839 from bparees/fix_jboss_test

Merged by openshift-bot