SPARK-2664. Deal with `--conf` options in spark-submit that relate to fl...

...ags