cbl-replication-mismatch-2-gateways/restart-gateway changes