RestApi should defend against poorly formed response bodies (it's possible for ActiveResource::ConnectionError#response to return a string)
Bug 958788 - port number missing from OPENSHIFT_MONGODB_DB_URL

* install script doesn't use -u, OPENSHIFT_MONGODB_DB_PORT was miss spelled
Merge pull request #2319 from smarterclayton/rest_api_defends_against_bad_exceptions

Merged by openshift-bot
Merge pull request #2327 from bdecoste/master

Merged by openshift-bot
<broker><oo-accept-broker> Bug 958674 - Fix Mongo SSL support

https://bugzilla.redhat.com/show_bug.cgi?id=958674

Update Broker mongoid config to properly support SSL connections to
mongo.

Update oo-accept-broker to not fail when attempting auth to mongo over
an SSL connection
Merge pull request #2328 from jwhonce/bug/958788

Merged by openshift-bot
Bug 958669: Fix MySQL var expansion in standalone.xml
Automatic commit of package [openshift-origin-cartridge-jbossews] release [0.3.4-1].
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.8.4-1].
Automatic commit of package [rubygem-openshift-origin-node] release [1.8.5-1].
Automatic commit of package [openshift-origin-cartridge-haproxy] release [0.3.5-1].
Automatic commit of package [openshift-origin-cartridge-postgresql] release [0.1.3-1].
Automatic commit of package [openshift-origin-cartridge-jbossas] release [1.1.5-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.8.5-1].
Automatic commit of package [openshift-origin-cartridge-jbossas-7] release [1.9.2-1].
Automatic commit of package [rubygem-openshift-origin-console] release [1.8.5-1].
Automatic commit of package [openshift-origin-cartridge-mongodb] release [1.7.4-1].
Merge pull request #2330 from detiber/bz958674

Merged by openshift-bot
Merge pull request #2332 from ironcladlou/bz/958669

Merged by openshift-bot