Merge latest changes from roxy into master

This is https://github.com/crowbar/barclamp-rabbitmq/pull/42 for master