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
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
Merge pull request #1558 from AppScale/key-size-issues

hash if the key of memcache is too large
Merge pull request #1 from nlake44/openstack

Minor Style Changes and merge with master.
Merge pull request #1556 from dnascimento/openstack_cloud

Openstack cloud and remove google class restrictions