Merge branch 'master' of git://git.apache.org/spark into yarn-scalastyle-modification
Merge branch 'master' of git://git.apache.org/spark into yarn-scalastyle-modification
Merge branch 'yarn-scalastyle-modification' of github.com:sarutak/spark into yarn-scalastyle-modification
Revert "Removed settings "YARNAlpha" and "YARNStable""

This reverts commit c59390f97de34b4bb11731e82eed16c3a282adb4.