Conflicts: changelog.html cli/pom.xml core/pom.xml maven-plugin/pom.xml plugins/pom.xml pom.xml remoting/pom.xml test/pom.xml ui-samples-plugin/pom.xml war/pom.xml
