HIVE-4724 Better detection of non-ORC files in the ORC reader


git-svn-id: https://svn.apache.org/repos/asf/hive/branches/branch-0.11@1505184 13f79535-47bb-0310-9956-ffa450edef68
HIVE-4496 : JDBC2 won't compile with JDK7 (Chris Drome via Navis)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1496332 13f79535-47bb-0310-9956-ffa450edef68

Conflicts:
	jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java