Fix for bug 980760
 - Preventing multiple versions of a cartridge from being added to the application
Bug 981528

When the cartridge is down, it will be sent 'force-reload', not
'reload'.
Respond to that, and communicate with the user that it is invalid.

Use client_result for now, so that the user can see the message

See https://bugzilla.redhat.com/show_bug.cgi?id=981780
Bug 980497 - Optimize these calls to oo-get-mcs-level.
mcoll action for getting env vars for a gear
Screen out cgroups variables that are missing on the system.
Fix config variable parsing. Split on comma before use of variable as array
Bug 974983

Set up $PATH so that ~/.gem/bin precedes /opt/rh/ruby193/root/usr/bin or
/usr/bin (as appropriate).

This effectively reverts fcc9026, which added RubyGems' path during the
user setup. That commit was incomplete, since that led to inconsistency
with the 1.9 apps (see
https://bugzilla.redhat.com/show_bug.cgi?id=974983#c8).

Instead, we use $OPENSHIFT_RUBY_PATH_ELEMENT to ensure that $PATH is
correct. (It is possible to use $OPENSHIFT_RUBYGEMS_PATH_ELEMENT still,
but that relies on $*_PATH_ELEMENT processing order, which we need to
avoid here.)
Merge pull request #3024 from abhgupta/bug_980760

Merged by openshift-bot
Merge pull request #3030 from rmillner/BZ980497

Merged by openshift-bot
Merge pull request #3031 from rajatchopra/master

Merged by openshift-bot
Merge pull request #3032 from kraman/missing_cgroups

Merged by openshift-bot
Restore "application destroyed" step which was removed in 5fa8baf6c1781c0e1553d5c424688f461773710a
Merge pull request #3020 from BanzaiMan/dev/hasari/bz981528

Merged by openshift-bot
Fix bug 980953 - allow conversion tracking
Bug 913809 - Proper psql error handling

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

This adds some extra error handling when using psql in a scaled application if the database server is stopped.
Merge pull request #3033 from BanzaiMan/dev/hasari/bz974983

Merged by openshift-bot
Bug 980487: Add jboss-cli.sh to the jboss* cartridges
Bug 968252: Clean up old marker README files
Merge pull request #3035 from kraman/bugfix

Merged by openshift-bot
Fix ApplicationStateFunctionalTest for F19
so that it creates test user in /var/tmp-tests instead of /tmp.
This avoids any poly-instantiated /tmp errors.