Add 'plan_history' to CloudUser model.
oo-admin-ctl-usage will also cache 'plan_history' and will pass to sync_usage().
Add social sharing links
Bug 950367 - Handle non-integer values for expires_in

Any param value of expires_in outside the range of 0..max_expires should be treated as the default value.
Bug 928668 - Provide better gear storage messages

Use terminology more in keeping with our UI messaging
eapv2 clustering
Calling oo-admin-cartridge from a few more v2 cartridges
oo-admin-broker-auth manpage fix
Labeling a few cucumber tests as @not-enterprise
<haproxy_ctld> Bug 920990 - fix p_usage showing usage message twice

updated p_usage method to drop straight out of program (via exit!) after
displaying usage instead of raising the "exit" exception
Update README.writing_cartridges.md
WIP Cartridge Refactor - Support for version overrides in manifest

* Take version choice in ctor
WIP Cartridge Refactor - update versions in manifest to be strings
as7 v2 cart and eap clustering
Automatic commit of package [openshift-origin-cartridge-jbossas] release [1.0.1-1].
Specifying an invalid embedded cartridge during app creation was throwing internal server error
Merge pull request #1997 from smarterclayton/bug_928668_better_messages_for_storage_limits

Merged by openshift-bot
Merge pull request #1998 from pravisankar/dev/ravi/card526

Add 'plan_history' to CloudUser model.
Merge pull request #2001 from brenton/misc2

Miscellaneous trivial commits
Merge pull request #1995 from smarterclayton/tweaks_to_quickstarts

Add social sharing link styles
Merge pull request #1993 from lnader/patch-2

Update README.writing_cartridges.md to add Additional-Control-Actions