HIVE-9019 - Avoid using SPARK_JAVA_OPTS [Spark Branch] (Rui Li via Brock)

git-svn-id: https://svn.apache.org/repos/asf/hive/branches/spark@1643896 13f79535-47bb-0310-9956-ffa450edef68
HIVE-9040 - Spark Memory can be formatted string [Spark Branch] (Jimmy Xiang via Brock)

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