Upgrading to Spark 2.0 and Java 8 Lambdas