Merge branch 'master' into resize-root
Merge branch 'resize-root' of https://git-wip-us.apache.org/repos/asf/cloudstack into resize-root
resizeroot: test for deployVirtualMachine with root disk size
resize-root: fix test_deploy_vm_root_resize to use default template