bumping to 2.1.6-SNAPSHOT
Merge branch '2.1-maint'

Conflicts:
	benchmark-run/pom.xml
	data-import/pom.xml
	pom.xml