CLOUDSTACK-6358: Missing patches in master branch
CLOUDSTACK-6358: Add missing patches in master for KVM
CLOUDSTACK-6358: Missing patches in master for VMware
CLOUDSTACK-6671: Missing patch in master
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack