Merge pull request #16896 from thatch45/jacksontj-2014.7-config

Merge #16889 with fixes

salt/client/ssh/ssh_py_shim.py

@@ -93,6 +93,7 @@ def unpack_ext(ext_path):
             'var',
             'cache',
             'salt',
+            'minion',
             'extmods')
     tfile = tarfile.TarFile.gzopen(ext_path)
     tfile.extractall(path=modcache)

salt/config.py

@@ -292,7 +292,7 @@ DEFAULT_MINION_OPTS = {
     'failhard': False,
     'autoload_dynamic_modules': True,
     'environment': None,
-    'extension_modules': os.path.join(salt.syspaths.CACHE_DIR, 'extmods'),
+    'extension_modules': '',
     'state_top': 'top.sls',
     'startup_states': '',
     'sls_list': [],