CLOUDSTACK-4395:[Object_store_refactor] Default template is not
available for use to deploy vm in case of multi zone environment.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack into vxlan-master
Merge branch 'vxlan-master' of github.com:haeena/cloudstack into vxlan-master
merge