Fix conflict detection in MapPatcher.

MapPatcher now also reports a conflict when removing a
mismatching value.

Change-Id: I277335f576986c2acf93f82191a14da41cc6a466