Force symlink creation in VM disk linkin to avoid failures in some scenarios
Merge remote-tracking branch 'upstream/one-4.4' into one-4.4