No infinity timeout, we could deadlock with the application controller on shutdown.
Look for the rabbit process, not the rabbit application.
Just in case this times out, let's not explode.
merge bug25571 into stable
merge stable into default