Merge HIVE-8403: Build broken by datanucleus.org being offline

git-svn-id: https://svn.apache.org/repos/asf/hive/branches/spark@1630229 13f79535-47bb-0310-9956-ffa450edef68
HIVE-7880: Support subquery [Spark Branch]

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