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)
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 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
Various iptables integration fixes

* oo-diagnostics will warn if /etc/sysconfig/iptables is missing
* oo-diagnostics will advise admins not to use lokkit (and offer helpful advice
  if they must)
* oo-admin-ctl-uptables-port-proxy will ensure the rhc-app-comm chain exist
* oo-admin-ctl-uptables-port-proxy's status method was improved to better handle custom NAT rules

This is to address:

Bug 1032798 - unable to create scaled app because of misconfigured iptables method
Bug 1027122 - Running lokkit tools on node will block openshift-iptables-port-proxy service starting.
Bug 1053639 - Following deployment instructions for OSE2.0 node seems to cause iptables issues with openshift-iptables-port-proxy service start

The latter has been very problematic because manual installs would tell users
to run a sed command.  If commands are copied wrong or out of order it can lead
to a broken setup.  Lokkit commands are much easier to copy/paste from a wiki.
Improving oo-admin-ctl-iptables-port-proxy's start method to handle a missing INPUT rule

Previously it would only append the rule. However, if it was after a REJECT
rule then it wouldn't take affect.
Fixing typo
Bug 1048758
Migrated notes on local DNS from drupal wiki module
Merge pull request #4611 from jwhonce/stage

Merged by openshift-bot
Merge pull request #4545 from brenton/iptables1

Merged by openshift-bot
Card #185: sending app alias to all web_proxy gears
Merge pull request #4615 from danmcp/master

Merged by openshift-bot
Merge pull request #4612 from nhr/docs_local_dns

Merged by openshift-bot
Merge pull request #4604 from ncdc/bug/1058849-apache-vhost-plugin-fixes

Merged by openshift-bot
Bug 1058889 - Return expected exit code on status operation
Merge pull request #4620 from jwhonce/bug/1058889

Merged by openshift-bot
Add external cartridge support to model

Ensure that imported downloadable cart manifests make it all the way
to the component creation.
Decorate some objects with more metadata.
Allow cartridges to be retrieved by id