Port cbfcd946ca49f2716761770fda114b7fc304b29c Changes excluded:project/SparkBuild.scala yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala

Conflicts:
	bin/compute-classpath.cmd