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
removing the restrict mode of google
Suppress interpretation of password characters
Prevent scheme from being "httpss"
Merge pull request #1554 from egrim/rpc-tweaks

RPC Tweaks
Support for Openstack as cloud service: auto-scaling
Die on exceptions
Merge pull request #1555 from AppScale/soap_ssl_issue

Soap ssl issue
Merge branch 'openstack_cloud' of https://github.com/dnascimento/appscale into openstack
stop monit on build
identation and minor-fixs
Merge branch 'openstack_cloud' of https://github.com/dnascimento/appscale into openstack
add zone and minor fix
A few style changes
merge conflicts
Merge pull request #1557 from AppScale/no-monit

stop monit on build
hash if the key of memcache is too large