Merge pull request #4584 from eclipse-ee4j/3.0.0-M6-BRANCH

Technical merge of released branch 3.0.0-M6-BRANCH