SPARK-1375. Additional spark-submit cleanup