[maven-release-plugin] prepare release 2.1.8
resolve conflicts