DERBY-6213: Convert a couple misc packages to Java 6.

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