HIVE-5716 - Fix broken tests after maven merge (1) (Brock Noland reviewed by Thejas M Nair and Ashutosh Chauhan)

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