Fix insertion issues in CommitMarker table

Make the Status (or query) the primary key and usethe replace conflict
 algorithm.

Change-Id: Iadf62d639957ee04dba0be3afed3c695a5c1f493