HIVE-8674 Fix tests after merge [Spark Branch] (Brock via Xuefu)

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