Extract form-important from #new-application
Added ownership of /var/log/openshift/broker
Bug 956667 - Updated MySQL v2 cart to install with oo-admin-cartridge in %post

https://bugzilla.redhat.com/show_bug.cgi?id=956667

Updated cartridges/openshift-origin-cartridge-mysql/openshift-origin-cartridge-mysql.spec
to install the cartridge with oo-admin-cartridge in %post, this
replicates identical behavior in the other v2 cartridges.
Merge pull request #2235 from detiber/bz956667

Merged by openshift-bot
Bug 956626: Fix jbossews-2.0 paths
956570
WIP Cartridge Refactor - cleanup in cartridges
Merge pull request #2237 from ironcladlou/bz/956626

Merged by openshift-bot
Fix bug 956018 - communicate database name to broker for v2 mysql
Merge pull request #2238 from danmcp/master

Merged by openshift-bot
Bug 956497: Fix port bindings for jboss carts
Bug 955538: Don't fail on error in mysql control
Bug 956670 - Fix static references to small gear size

https://bugzilla.redhat.com/show_bug.cgi?id=956670

Creating a new district would default to small gear size even if
DEFAULT_GEAR_SIZE has been updated.  This updates the static references
to use the DEFAULT_GEAR_SIZE instead.

Also added a test to verify that new districts created without gear size
specified use the default_gear_size instead of small
Add a class for accessing cgroups parameters for a gear and reproduce the v1 behavior.
Move haproxy shared scripts into /usr/bin.
Fix mock-0.2 display name
Merge pull request #2239 from jwhonce/wip/raw_envvar

Merged by openshift-bot
Merge pull request #2241 from pmorie/dev/v2_mysql

Merged by openshift-bot
Merge pull request #2244 from ironcladlou/bz/956497

Merged by openshift-bot
Merge pull request #2246 from ironcladlou/bz/955538

Merged by openshift-bot