Merge pull request #23764 from eclipse-ee4j/6.2.4-BRANCH

Merge 6.2.4 branch into master - set version to 6.2.5-SNAPSHOT 1