Applying HIVE-4785
Merging in support for missing JDBC methods