Adding unique keys to replace the previous (c_id,id) primary key - refs #6500