HIVE-8994 - Merge from trunk Nov 28 2014 (post merge fix)

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