Clean up the assertion
Merge pull request #2883 from jwforres/bug_975365_404_quickstart_deploy_now

Merged by openshift-bot
PULL_2005 added tests for adding supplementary groups when creating new gears in a node
PULL_2005 fixed code review bugs for adding supplementary groups to new gears
PULL_2005 Changed GEAR_SUPL_GRPS to GEAR_SUPPLEMENTARY_GROUPS in node and tests
fix bz977519 - for cases where v2 parsing succeeds but broker manifest parsing fails
some strictures on broker's manifest parsing
Bug 977563

Instead of using glob, explicitly list templates belonging to the Ruby
cartridge.
Merge pull request #2932 from pmorie/dev/v1_delete

Merged by openshift-bot
Merge pull request #2928 from BanzaiMan/dev/hasari/bz971622

Merged by openshift-bot
Merge pull request #2938 from rajatchopra/master

Merged by openshift-bot
remote-user: Fix .conf migration in %post

If the remote-user auth plug-in is installed but is not enabled at the
time of an upgrade, its httpd configuration file may not be present.  In
order to avoid causing an error during a package upgrade, only modify
the file if it is present.
Fix for bug 977224
Merge pull request #2944 from abhgupta/abhgupta-dev

Merged by openshift-bot
Merge remote-tracking branch 'origin/master' into bug_970257_support_git_at_urls

Conflicts:
	controller/app/controllers/applications_controller.rb
	node/lib/openshift-origin-node/model/application_container.rb
enable rhscl repos - add wrapper
Broker source mode should reload classes, only load plugins in broker_plugins.rb
Merge pull request #2743 from adelton/mod_auth_kerb

Merged by openshift-bot
Merge pull request #2947 from smarterclayton/fixes_for_broker_source

Merged by openshift-bot
Tests pass fully (add initial_git_url for earlier api versions).  Control what values of URI get persisted to DB (passwords and userinfo from clone specs should not be)