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