Merge "Adds stop and disable for libvirtd on upgrade to containers"