SPARK-1121 Only add avro if the build is for Hadoop 0.23.X and SPARK_YARN is set#6

ScrapCodes wants to merge 2 commits intoapache:masterapache/spark:masterfrom

ScrapCodes:SPARK-1121/avro-dep-fixScrapCodes/spark:SPARK-1121/avro-dep-fixCopy head branch name to clipboard