add test for jboss snapshot/restore that includes app content
Merge pull request #4733 from abhgupta/abhgupta-dev

Merged by openshift-bot
Activate obsolete cartridges in devenv
Merge pull request #4752 from bparees/restore_test

Merged by openshift-bot
Bug 1064650 - oo-admin-ctl-cartridge handles bad input
Merge pull request #4754 from smarterclayton/activate_obsolete_carts

Merged by openshift-bot
Merge pull request #4755 from smarterclayton/bug_1064650_return_error_on_bad_input

Merged by openshift-bot
Fix for bug 1064838 and partial fix for bug 1064141
 - Setting comp_spec attributes for ha apps only if the app is ha
 - fixing a typo in variable name where 'gear' was used instead of 'g'