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