Merge pull request #1912 from apache/abderrahim/2.2

Prepare 2.2.0 release