oops, fix stupid compile error
Merge branch 'executor_spark_home' into imran/0.6-debug