Merge branch 'java_batching' of https://github.com/AppScale/appscale
Merge branch 'master' of https://github.com/AppScale/appscale
Merge branch 'master' of https://github.com/AppScale/appscale
Merge branch 'djinn-slave-restore' of https://github.com/nlake44/appscale
Die on exceptions
Merge pull request #1555 from AppScale/soap_ssl_issue

Soap ssl issue