(#807) - cleanup conflict revs in changes/allDocs

* code cleanup and simplification
* test fixed so it tests allDocs
* small bug fixed (one map removal was forgotten)