Fix merge order of options in run_wfunc (fix mine.get issues)

This fix issues with mine.get when using salt-ssh (saltstack#36796)

The dict merge order matters and master_opts needs to take precedence in order to mine.get over salt-ssh to work properly.

salt/client/ssh/__init__.py

@@ -922,8 +922,8 @@ def run_wfunc(self):
                     opts_pkg['grains'][grain] = self.target['grains'][grain]
 
             popts = {}
-            popts.update(opts_pkg['__master_opts__'])
             popts.update(opts_pkg)
+            popts.update(opts_pkg['__master_opts__'])
             pillar = salt.pillar.Pillar(
                     popts,
                     opts_pkg['grains'],