Conflicts: cli/pom.xml core/pom.xml debian/debian/changelog plugins/pom.xml pom.xml test/pom.xml war/pom.xml