On the other hand, it might make more sense to move towards consistency between yarn and standalone/mesos, for which MASTER only specifies the cluster manager, and not the application's deploy mode.  For this, we would allow just giving --master to spark-submit as "yarn", and yarn-client vs. yarn-standalone would be inferred depending on --deploy-mode.