DERBY-6945: Move org.apache.derby.jdbc package into derbytools.jar; tests passed cleanly on derby-6945-19-ad-movePublicAPIintoToolsJar.diff.