Fixed itests broken by KARAF-1851

git-svn-id: https://svn.apache.org/repos/asf/karaf/trunk@1448904 13f79535-47bb-0310-9956-ffa450edef68
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