Merge "Fix containerized RabbitMQ service deployment"