[maven-release-plugin] prepare release server-2.3.1
[maven-release-plugin] prepare for next development iteration
move changelog from root to server
Null merge pom changes to prevent overwriting version when merging release to master

    Merge branch 'release' (early part) into integration/master
Merge branch 'release' into integration/master