Fix merge clash
Fixes #1730
Fix typo
Fixes #1710
Proper fixed for #1710
[maven-release-plugin] prepare release atmosphere-project-2.2.2
[maven-release-plugin] prepare for next development iteration
Fixes #1729
Fixes #1732
Improve logging
Fixes #1735
Oups, fix NPE