Merge branch 'master' of git://github.com/AppScale/appscale into throughput-testing
removed rabbitmq and ejabberd
Merge branch 'throughput-testing' of git://github.com/AppScale/appscale into no-rabbitmq
Merge pull request #1629 from menivaitsi/throughput-testing

Fixes broken unit test for app manager.
Merge branch 'no-rabbitmq' of https://github.com/AppScale/appscale into throughput-testing