DERBY-6280; test failure in SetQueryTimeoutTest ComparisonFailure: Output at line 16 expected:<Test[ing that PreparedStatement remembers timeout.]> but was:<Test[ SetQueryTimeoutTest FAILED]>
  merge of revisions 1571764 and 1571769 from trunk


git-svn-id: https://svn.apache.org/repos/asf/db/derby/code/branches/10.10@1571771 13f79535-47bb-0310-9956-ffa450edef68