Shark 0.11 ojdk7: npath renaming backport; resource leaks in JDBC

These are affecting underlying Hive 0.11