Merge and Updates for the new URI handlers.
Merge branch 'master' of https://github.com/cts2/lexevs-service.git
Merge branch 'master' of https://github.com/cts2/lexevs-service.git
Merge branch 'master' of https://github.com/cts2/lexevs-service.git

Conflicts:
	src/main/java/edu/mayo/cts2/framework/plugin/service/lexevs/service/entity/LexEvsEntityQueryService.java
Merge branch 'master' of https://github.com/cts2/lexevs-service.git