CLOUDSTACK-6181: Merge of resize root feature (resize-root branch)