HIVE-5637 : Sporadic minimr test failure (Navis via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1535510 13f79535-47bb-0310-9956-ffa450edef68
HIVE-5629 : Fix two javadoc failures in HCatalog (Brock Noland via Ashutosh Chauhan)

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