Merge "change rabbitmq-server to rabbitmq for all installers"