Hopefully solves recent build failures with licensing

Conflicts:
	pom.xml
Merge branch '2.1-maint'

Conflicts:
	pom.xml
Fixing build configuration re; licencing
Merge branch '2.1-maint'
Fix flaky index sampling test.
Revert "Fix flaky index sampling test."

This reverts commit af2bed3bd20f447e503425da40034cae45443977.
Actual fix for flaky index sampling test.
Fixes an issue in StringIdMapper where size instead if high index should be used
Fixed NPE in bootstrapper when properties file not specified