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

RPC Tweaks
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
Merge branch 'openstack_cloud' of https://github.com/dnascimento/appscale into openstack
A few style changes
merge conflicts
Merge pull request #1 from nlake44/openstack

Minor Style Changes and merge with master.