update to latest schema level and add size based log rotation
Bug 995807 - Jenkins builds fail on downloadable cartridges
Move cartridges into Mongo

Cleans up group_override flow throughout the code
Move storage of downloaded cart info to the component_instance
Persist gear size and addtl_fs_gb storage on the group instance
When adding a cartridge, track the ID of the cart all the way through
Allow all application options to be passed to create on REST API
Allow all relevant cart settings to be passed to cart add on REST API
Support cartridge upgrade (simple) via update_requirements
Allow domain to be created on app create via REST API
Remove Profile from the cartridge model
Disallow creating cartridges with more than one component
Add many more unit tests for app and cartridge logic

Implements origin_broker_193
Allow gemspecs to be parsed on non RPM systems (like the rest of cartridges)
Fix the Apache vhost plugin

Fix bug in the Apache vhost plugin that prevented it from functioning.

Change V_MATCH_HOST to %v in custom access log format so the server name
is included in the log (V_MATCH_HOST is only available when using the
mod rewrite plugin).

Bug 1058849
Card origin_node_376 - namespace /tmp for non-gear users on Nodes

* polyinstantiate /tmp for users on Nodes that are not gears
* remove v1 cartridge support from oo-namespace-init
Pairing down cuc tests
Speeding up merges
<models/application.rb> standardize whitespace
<broker> conf to allow alias under cloud domain - bug 1040257

https://bugzilla.redhat.com/show_bug.cgi?id=1040257
<broker> always prevent alias conflicts with app names
Merge pull request #4607 from danmcp/master

Merged by openshift-bot
bug 1054654
Revert "Merge pull request #4519 from lsm5/new-node_conf"

This reverts commit 1164719ad9e0422fe02ab8085586bf4ac1e4bb2d, reversing
changes made to 10a79bc05fcc88a0b355444c6f2e48c8421531d1.
Revert "Merge pull request #4488 from lsm5/new-node_conf"

This reverts commit b821263d40132e3486d12261f2443e441d8d1d44, reversing
changes made to 7228732ae0626790d4360cfa4552a583ef68ff61.
Merge pull request #4401 from sosiouxme/bug1040257

Merged by openshift-bot
Merge pull request #4490 from bparees/update_jbossas_schema

Merged by openshift-bot
Merge pull request #4613 from jwhonce/origin_node_376

Merged by openshift-bot
Merge pull request #4608 from lnader/master

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

Conflicts:
	controller/app/controllers/cartridges_controller.rb
	controller/app/models/application.rb
	controller/test/cucumber/rest-applications.feature