Merge branch 'master' of github.com:tcpcloud/salt-formula-rabbitmq into stacklight