issue #826: Replication fails when a collection's configuration changes

Conflicts:
	CHANGELOG
added tests