also update cim_reg_eventadmin on merge
Merge branch 'c4c.staging' into c4c.dev