Bring back adding --more-jars to the classpath and default master to local