Add more protections for out of order db commits that cross indexing or replication batches