[Libvirt-cim] [PATCH] A few schema cleanups after migrating from 2.16 to 2.21