Merge pull request #5188 from eclipse-ee4j/3.1.0-BRANCH

Technical merge of released branch 3.1.0-BRANCH