Merge pull request #15950 from apache/master

Prepare to release 5.2.2