Upgraded AMQ + bugs found thanks to the upgrade

2 tests are still weird in TestMultiNode...