Merge pull request #518 from nlake44/zk-fix2

Better exception handling for ZK
Merge branch 'testing' of github.com:AppScale/appscale into db-perf2