Merge branch 'master' into Version-2

# Conflicts:
#	kop-common-dependencies/pom.xml
#	kop-common-lib/pom.xml
#	kop-common-parent/pom.xml
#	kop-common-pdf/pom.xml
#	kop-common-test/pom.xml
#	pom.xml