cherry picking advanced

Conflicts:
	kba.git.testing/src/test/java/net/kba/git/testing/HelloWorldTest.java