Merge pull request #23803 from eclipse-ee4j/6.2.5-BRANCH

Merge 6.2.5 branch