Bump version to 2.2
Merge branch 'release/2.2' into develop
Bump version to 2.3-SNAPSHOT