copy change from rabbit_amqqueue_process to slave
for consistency
merge bug25353 into stable
merge stable into default
tidy up
merge bug25353 into stable
merge stable into default
merge heads