Merge pull request #2205 from jcockhren/fix_2204

provisioners/salt: need_configure should return true when master_config is defined as well.

plugins/provisioners/salt/provisioner.rb

@@ -59,7 +59,7 @@ module VagrantPlugins
       end
 
       def need_configure
-        @config.minion_config or @config.minion_key
+        @config.minion_config or @config.minion_key or @config.master_config or @config.master_key
       end
 
       def need_install