Improve test_two_consumergroup_join cleanup
Improve test_two_consumergroup_join cleanup

This test is currently failing, but the logs are cluttered with messages
relating to unclean shutdown. Change it to always clean up properly with
addCleanup().

ciena/afkak,ciena/afkak