Merge rabbit-mq branch with develop

The only conflict was in pom.xml.