35948 fixes replication acceptance project and minor cleanup after removal of deprecated api