Fix libvirtd execution

libvirtd would fail to successfully run on Mac OS X. With these two
upstream changes that is resolved. It can be tested by running 'virsh
version'.