Bringing in benchmarks branch to latest Spark master

Which contains a variety of fixes and minor perf improvements.