prevent data loss when collection_dump=False
Merge branch 'master' into 2.0-dev

Conflicts:
	mongo_connector/oplog_manager.py