HIVE-8854 : Guava dependency conflict between hive driver and remote spark context[Spark Branch] (Marcelo Vanzin via Szehon)

git-svn-id: https://svn.apache.org/repos/asf/hive/branches/spark@1640633 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'upstream/spark' into spark
Merge remote branch 'origin/spark' into HIVE-8834