OPENJPA-1988: Made an update to the test case for this JIRA, i.e. merged r1641906 from 2.2.x to trunk.