move to 2.1.6
remove steps from query4 implementation
Merge branch '2.0-maint' into 2.1-maint
Merge branch '2.1-maint'

Conflicts:
	benchmark-run/pom.xml
	data-import/pom.xml
	pom.xml
update code to use latest 2.2 server config API