HIVE-5362 : TestHCatHBaseInputFormat has a bug which will not allow it to run on JDK7 and RHEL 6 (Viraj Bhat via Sushanth Sowmyan)

git-svn-id: https://svn.apache.org/repos/asf/hive/branches/branch-0.12@1526726 13f79535-47bb-0310-9956-ffa450edef68
HIVE-5199: Custom SerDe containing a nonSettable complex data type row object inspector throws cast exception with HIVE 0.11 - HIVE-5199-0.12-branch.conflict.patch (Hari Sankar Sivarama Subramaniyan via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/branches/branch-0.12@1526727 13f79535-47bb-0310-9956-ffa450edef68