Fix rabbitmq test
Merge branch 'master' of github.com:BrightcoveOS/Diamond
Merge branch 'master' of github.com:BrightcoveOS/Diamond