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.
Found more cases when a hash join can be terminated early
Fixes an issue in StringIdMapper where size instead if high index should be used
Import tool docs and packaging.

* Add docs.
* Include it to be deployed with mvn artifacts.
* Include it in download packages.
* Fix script to look for the correct class.
* Upgrade doctools to get bugfix for code listings in manpages.
Fixed NPE in bootstrapper when properties file not specified
Merge pull request #3451 from nawroth/import

Import tool docs and packaging.
Merge pull request #3450 from lutovich/2.2-npe-in-bootstrapper

NPE in Bootstrapper#start when neo4j.properties not specified
Merge pull request #3449 from systay/smarter-hash-joins

Found more cases when a hash join can be terminated early
Check consistency of counts store

- disable computation of relationship counts for (label,type,label) in PBI and CountsComputer