[KARAF-1851] Fixes for features v1.2.0
Fix karaf-maven-plugin integration tests
Merge remote-tracking branch 'upstream/trunk' into trunk

Conflicts:
	tooling/karaf-maven-plugin/src/it/test-basic-generation/control.xml
	tooling/karaf-maven-plugin/src/it/test-type-classifier/control.xml
Merge branch 'trunk' of github.com:apache/karaf into trunk
Merge branch 'trunk' of github.com:tnaroska/karaf into trunk