Fix for bug 1040673
Modify PHP stop() to skip httpd stop when the process is already dead
Applied fix to other affected cartridges
Fix for bug 1047950 and bug 1047952
Merge pull request #4411 from nhr/service_fixes

Merged by openshift-bot
Card online_node_319 - Add quota check to git push

* Add Node#check_quotas to centralized quota reporting
* Refactor openshift#report_quota to use new method
* Add call to check_quotas to cartridge_actions#post_receive if stderr is provided
Merge pull request #4418 from abhgupta/bug_1040673

Merged by openshift-bot
Merge pull request #4421 from abhgupta/abhgupta-scheduler

Merged by openshift-bot
Merge pull request #4423 from jwhonce/online_node_319

Merged by openshift-bot
Merge remote-tracking branch 'origin/master' into add_cartridge_mongo_type

Conflicts:
	controller/app/controllers/emb_cart_controller.rb