ENG-5714 Improved JDBC support for database tools.

See comment in https://issues.voltdb.com/browse/ENG-5714

Jenkins passed