Revert HIVE-8303: Merge from trunk to spark 9/29/14

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