Fix mailmap problem
Fix mailmap
Merge branch 'navajo.adapters.hotfix'

Conflicts:
	server/com.dexels.navajo.adapters/META-INF/MANIFEST.MF
	server/com.dexels.navajo.adapters/pom.xml