Bug 1079844: Fixed error message when removing an invalid cartridge
fix is_running check to properly treat empty pidfile as not running
Revert "Updated cartridges to stop after post_restore"

This reverts commit b8baa4c4ccae27b3cc50081f08d9eef9e3ee581b.

Conflicts:
	cartridges/openshift-origin-cartridge-mongodb/bin/control
Bug 1081381 - Validate --gear option in oo-admin-usage
Bug 1073342 - oo-admin-chk fix: don't print duplicate error messages when login is null/empty
Bug 1008654 - oo-admin-chk: Report app gears with out server_identity field set in mongo
Bug 1082464 - Do not show links for ADD_MEMBER, UPDATE_MEMBERS, DELETE AND LEAVE for global teams
Check the return code before writing PID file in Python start_app()
Merge pull request #5149 from bparees/revert_db_stop

Merged by openshift-bot
Merge pull request #5152 from pravisankar/dev/ravi/bugs-1081381-1073342-1008654

Merged by openshift-bot
Merge pull request #5151 from danmcp/master

Split user errors and internal errors for analytics
Merge pull request #5137 from abhgupta/abhgupta-dev

Merged by openshift-bot
Force httpd into its own pgroup

Force httpd into its own pgroup to prevent it from TERMing processes
it doesn't own during shutdown.

Resolve bug https://bugzilla.redhat.com/show_bug.cgi?id=1083756
Merge pull request #5155 from lnader/master

Merged by openshift-bot
Merge pull request #5156 from mfojtik/python_return_check

Merged by openshift-bot
Merge pull request #5144 from bparees/psql_migrate_restart

Merged by openshift-bot
hide output from pgrep
Merge pull request #5157 from ironcladlou/httpd-pgroup-fix

Merged by openshift-bot
Revert "Revert "Card origin_cartridge_133 - Maintain application state across snapshot/restore""

This reverts commit 6fd30130f9e969e43be8c69ba3c5ef577854737f.
This reverts commit 7984305db293bfa7c82cdbc3d69926db0f463487.
Merge pull request #5159 from bparees/cleanup_sdk

Merged by openshift-bot