commit for pull
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop

Conflicts:
	admin/mojo/src/main/java/org/ihtsdo/otf/mapping/mojo/MapAdviceInvalidFifthCharacterRemoverMojo.java
	admin/mojo/src/main/java/org/ihtsdo/otf/mapping/mojo/QAFixInvalidTargets.java
MAP-1041:  All unit tests and fixes for user/action workflow validation
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop

Conflicts:
	model/src/main/java/org/ihtsdo/otf/mapping/helpers/WorkflowStatusCombination.java