Merge pull request #3345 from abhgupta/abhgupta-scheduler

Merged by openshift-bot
Merge pull request #3347 from mrunalp/dev/as-multi-ha

Merged by openshift-bot
<broker> improve Gemfile loading + bug 993250

https://bugzilla.redhat.com/show_bug.cgi?id=993250
Bundler load failures are wrapped and re-interpreted for OpenShift
  instead of telling the user to "bundle install"
OPENSHIFT_CONF_DIR overrides /etc/openshift base for broker config files
Gemfile loads plugins even if just the -dev.conf file is present
Plugins are loaded in sorted order, in case it matters
Merge pull request #3294 from sosiouxme/broker-plugin-loading

Merged by openshift-bot
save exposed port interfaces of a gear
Merge pull request #3349 from rajatchopra/master

Merged by openshift-bot
BZ#985218: Display more user-friendly error message when erasing non-existing cartridge
remove oo-cart-version
Bug 980296
Merge pull request #3322 from smarterclayton/origin_ui_73_membership_model

Merged by openshift-bot
Merge pull request #3353 from mfojtik/bugzilla/985218

Merged by openshift-bot
Merge pull request #3352 from danmcp/master

Merged by openshift-bot
Fix for bug 990927
Bug 997129 - oo-last-access script chokes on /etc/openshift/node.conf with only space in configuration line
Merge pull request #3357 from abhgupta/abhgupta-scheduler

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.13.2-1].
Automatic commit of package [rubygem-openshift-origin-node] release [1.13.4-1].
Automatic commit of package [openshift-origin-cartridge-nodejs] release [1.14.2-1].
Automatic commit of package [openshift-origin-cartridge-haproxy] release [0.8.2-1].
Automatic commit of package [openshift-origin-broker-util] release [1.13.3-1].
Automatic commit of package [rubygem-openshift-origin-common] release [1.13.2-1].