HIVE-5674 - Merge latest trunk into branch and fix resulting tests

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