DERBY-6000: Fix misc issues raised by JDBC 4.2 buddy testing.

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