MAP-687:  WorkflowException and Not-A-Conflict controls
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop

Conflicts:
	webapp/src/main/webapp/js/widgets/compareRecords/compareRecords.html