Replication cleanup part3
Merge pull request #2200 from monikaprabhu/repBranch

Replication cleanup part3