MAP-807:  Fixed issue with re-edited records attempting to Publish a previous conflict now not in conflict
Also fixed similar problem on FIX_ERROR_PATH
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop