MAP-127: As an admin, I need to integrate the overarching OTF security
solution with user and role management within OTF Mapping application
Merge branch 'master' of https://github.com/WestCoastInformatics/OTF-Mapping-Service.git

Conflicts:
	jpa-services/pom.xml