Merge branch 'testing' of github.com:AppScale/appscale into zk-fix2
removed deadcode, made it so we clean up old query cursors
Merge branch 'testing' of github.com:AppScale/appscale into db-perf2
Merge pull request #519 from nlake44/db-perf2

Removed deadcode, remove old cursors.