added more tests to improve coverage
Merge pull request #3273 from sosiouxme/admin-stats-tests

Merged by openshift-bot
Fix runtime-extended tests for jboss cartridges

The jboss cartridge cartridge-lifecycle-jboss{as,eap}.feature scripts
were assuming all artifacts (exploded and archive) were being deployed
after multi-artifact deployment, when the deployment-scanner was
reverted back to deploying only archive artifacts it broke this
assumption.
Bug 991225: upgrade script should be run before setup during incompatible upgrade
Merge pull request #3276 from detiber/fixtests

Merged by openshift-bot
Handle race condition when trying to throttle gears that no longer exist
Merge pull request #3272 from lnader/master

Merged by openshift-bot
More language cleanup & consolidation
Merge pull request #3274 from pmorie/bugs/991225

Merged by openshift-bot
Merge pull request #3280 from fotioslindiakos/Bug991480

Merged by openshift-bot
Bug 989782: Node platform should not log user sensitive login name and password credentials

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

Various functions are logging the output from cartridge creation which
can contain sensitive information. Sanitizing this information in the
logger is the most central way to ensure we catch everything.
Merge pull request #3282 from nhr/updates

Merged by openshift-bot
Merge pull request #3243 from fotioslindiakos/Bug989782

Merged by openshift-bot
<mongo> allow db access with mongo client 1.6
Merge pull request #3284 from sosiouxme/fix-mongo-client

Merged by openshift-bot
Bug 991824: Make watchman logging configurable via node.conf
Merge pull request #3285 from ironcladlou/bz/991824

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