Merge whitespace/comment changes from libvirt upstream