make bitronix have the same version number every where
Merge branch 'master' into BS-6674_TenantMaintMode

Conflicts:
	pom.xml