Merge "Remove libvirt apparmor workaround"