SPARK-2641: Fixing how spark arguments are loaded from properties file

Since we can set spark executor memory and executor cores using property file, we must also be allowed to set the executor instances.
Do we want to do this for yarn only?