Update references to Spark packages using org.apache.spark. Other minor changes.