Merge pull request #15951 from apache/release-dev

Release 5.2.2