Merge branch 'branch-0.9' of github.com:apache/spark into csd-2.10