Merge "Move RabbitMQ settings out of controller.yaml"