HIVE-8993: Make sure Spark + HS2 work [Spark Branch] (Chengxiang via Xuefu)

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