Prevent exit() call from mcollective on rpc_client connect error, throw
appropriate exception
Bug 921902
Merge pull request #1764 from bdecoste/master

Merged by openshift-bot
Fix for bug 924651
Automatic commit of package [openshift-origin-cartridge-switchyard-0.6] release [1.5.3-1].
Automatic commit of package [rubygem-openshift-origin-node] release [1.6.6-1].
Automatic commit of package [openshift-origin-cartridge-jbosseap-6.0] release [1.6.4-1].
Automatic commit of package [openshift-origin-cartridge-perl] release [0.1.5-1].
Automatic commit of package [openshift-origin-cartridge-jenkins-client] release [1.5.6-1].
Automatic commit of package [openshift-origin-cartridge-mock] release [0.1.5-1].
Automatic commit of package [openshift-origin-cartridge-jbosseap] release [2.0.5-1].
Automatic commit of package [openshift-origin-cartridge-jbossas-7] release [1.6.4-1].
Automatic commit of package [openshift-origin-cartridge-abstract] release [1.6.4-1].
Automatic commit of package [openshift-origin-cartridge-php] release [0.1.5-1].
Automatic commit of package [openshift-origin-cartridge-jenkins] release [1.6.6-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.6.5-1].
Automatic commit of package [openshift-origin-node-util] release [1.6.5-1].
Merge pull request #1767 from abhgupta/abhgupta-dev

Merged by openshift-bot
Merge pull request #1505 from jreuning/bug-916809

Merged by openshift-bot