[maven-release-plugin] prepare release server-3.5.1
[maven-release-plugin] prepare for next development iteration
Merge branch 'release' into integration/master

Merged using -s ours to prevent future merges from release overwriting the
versions in pom.xml.