Merge tag '2.1.0.M2' into ci-master

[maven-release-plugin] copy for tag 2.1.0.M2