2.2.0rc2 readiness
Merge branch 'releases/2.2.0rc2'

2.2.0rc2 readiness
Bump version back to 2.2.0dev
Merge branch 'version/bump'

Back to 2.2.0dev