inline new manifest merge API from JdkManifestFactory to work with plexus-archiver versions post 2.1

Conflicts:
	org.sonatype.m2e.mavenarchiver.feature/feature.xml
	org.sonatype.m2e.mavenarchiver/META-INF/MANIFEST.MF
add test case to cover new manifest merge API