Merge in default.
Check if the rabbit process is running and thus avoid deadlocks in the application controller.
Merged bug25499 into default
Merge default