Merge pull request #1795 from jbertram/2.3.x

Release 2.3.21.Final
BZ965093 - Thread leak test failure with IBM JRE