origin_broker_25
Bug 987268
Double protect URL arguments in gear (users can't break gear deployment)
Merge pull request #3149 from sosiouxme/add-docs

Merged by openshift-bot
Merge pull request #3088 from lnader/card-25

Merged by openshift-bot
Merge pull request #3150 from smarterclayton/protect_url_argument

Merged by openshift-bot
oo-admin-ctl-usage: Process billing and non-billing usage records separately
Merge pull request #3151 from pravisankar/dev/ravi/ctl-usage-fixes

Merged by openshift-bot
<application.rb> Add feature to carts to handle wildcard ENV variable subscriptions

https://trello.com/c/B0BXoIjK/160-5-option-to-get-all-published-env-vars-carteco

 * Created new method - subscription_filter - to resolve
   subscriptions for component_instances without altering the
   cartridge objects themselves. This method
   handles "traditional" environment variable subscription
   and "wildcard" ENV:* subscription.

 * Added logic to elaborate method to consume new subscriptions
   array

 * Updated carts to use new wildcard environment variable
   subscription where appropriate

 * Added tests to verify both wildcard and traditional
   subscription specification in cart manifest is handled
   properly

 * Added logic to cart_repo_helper.rb to clean up both mock and
   mock-plugin carts

 * Added two unit tests to exercise elaborate() and
   subscription_filter() for cases where environment variables are
   subscribed to via "ENV:*" and where they are subscribed via
   connection type specification
   (i.e. "ENV:NET_TCP:db:connection-info")
<broker> Add mocking for Cartridge.categories in unit test

recent rebase changed the code path in process_group_overrides so that
the un-mocked ```categories``` method is called on mocked
```OpenShift::Cartridge```, which caused the tests in
```subscription_test.rb``` to fail. This commit mocks the missing
method so that the tests will pass.
Merge pull request #3007 from dobbymoodge/env-wc-2

Merged by openshift-bot
Bug 987872
fix bz987773, make max calculation use a floating point
Merge pull request #3153 from danmcp/master

Merged by openshift-bot
spelling fix
Merge pull request #3154 from rajatchopra/master

Merged by openshift-bot
<admin-console> broker proxy RPP change + filling in README
<admin-console> adding some configuration options
<admin-console> revising packaging