Merge branch 'OPENJPA-2713'