[maven-release-plugin] prepare release wro4j-parent-1.6.3
fix merge conflicts