Merge branch 'master' of https://github.com/apache/spark into shim-thriftserver1