CLOUDSTACK-6170
Merge branch '4.4' into resize-root