[SPARK-10008] Ensure shuffle locality doesn't take precedence over narrow deps#8220

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

mateiz:shuffle-loc-fixmateiz/spark:shuffle-loc-fixCopy head branch name to clipboard