Checking in more CMPI changes