Hopefully solves recent build failures with licensing

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

Conflicts:
	pom.xml