Merge "Fix assembly xmls for maven-assembly-plugin v2.2+"