Merge "open-vm-tools: drop backport"