Replacing the method to fix COOK-2676
Merge branch 'COOK-2676' of github.com:mre/rabbitmq into COOK-2676
Version bump