[OPS-2230] update branch for new rabbitmq version and fix some whitespace