Merge branch 'master' of https://github.com/apache/incubator-spark into csd-2.10
Merge branch 'csd-2.10' of github.com:markhamstra/incubator-spark into csd-2.10