sync with upstream.
match updated open-vm-tools userland.