Merge pull request #921 from ddurnev/master

[RJA-xxx] version 2.2.0-SNAPSHOT bump
[RJA-2035][RJA-2085][fix] - Fixes
Merge pull request #923 from rsvato/master

[RJA-2035][RJA-2085][fix] - Fixes
[RJA-XXX][fix]: do not start akka remoting in unit tests