gerrit replication fixes