Merge CubeQueryContextWithStorage with CubeQueryContext

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