Modified the style
Merge branch 'master' of git://git.apache.org/spark into SPARK-3106
Merge branch 'SPARK-3106' of github.com:sarutak/spark into SPARK-3106