replication.xml large addition
Merge branch 'ocelot-master'