DERBY-6114: OOME in XAMemTest.testDerby4137_TransactionTimeoutSpecifiedNotExceeded Merged revision 1492094 from trunk and manually resolved conflicts.