Merge pull request #4788 from eclipse-ee4j/3.0.2-BRANCH

Technical merge of released branch 3.0.2-BRANCH