Merge pull request #4703 from eclipse-ee4j/3.0.1-BRANCH Technical merge of released branch 3.0.1-BRANCH