Merge pull request #1623 from AppScale/master

Merge with master
Merge branch 'throughput-testing' of git://github.com/AppScale/appscale into no-rabbitmq