Merge branch 'master' of github.com:apache/spark into yarn-shuffle-build
Fix line too long