few minor changes to support using groovy with the spark shell from spark-project.org