Merge "Revert "Use FQDN for rabbitmq's nodename env variable""