DERBY-6213: Convert JDBC build scripts to Java 6 and misc merges.

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