Merge pull request #4505 from eclipse-ee4j/3.0.0-M5-BRANCH

Technical merge of released branch 3.0.0-M5-BRANCH