Apply Gary Fredericks' JDBC-46 patch 3

Signed-off-by: Sean Corfield <sean@corfield.org>
Merge branch 'jdbc46'

Resolves testing conflict between patch and current state of master.

Conflicts:
	src/test/clojure/clojure/java/test_jdbc.clj