Towards recovery-safe basic.ack/nack/reject
merge heads of branch bug14587
Remove a test that isn't ready to be committed yet