prepare for 2.4.4
...
Minor test refactoring, trying to tease out a unit test fail problem
Merge branch '2.4'

Conflicts:
	pom.xml
	release-notes/VERSION