Fixed an oversight left while merging.
Migrated properties used in spark context and spark env.