Merge "Fix rabbitmq port on metadata" into release/2019.2.0