Revert "The SPM verbose flag should be in SPM defaults"

This reverts commit 98b903a196.

salt/config/__init__.py

@@ -775,9 +775,6 @@ VALID_OPTS = {
 
     # Delay in seconds before executing bootstrap (salt cloud)
     'bootstrap_delay': int,
-
-    # SPM verbosity flag
-    'verbose': bool,
 }
 
 # default configurations
@@ -1282,7 +1279,6 @@ DEFAULT_API_OPTS = {
 }
 
 DEFAULT_SPM_OPTS = {
-    'verbose': False,
     # ----- Salt master settings overridden by SPM --------------------->
     'conf_file': os.path.join(salt.syspaths.CONFIG_DIR, 'spm'),
     'formula_path': '/srv/spm/salt',

tests/unit/spm_test.py

@@ -38,6 +38,7 @@ __opts__ = {
     'reactor_path': os.path.join(_TMP_SPM, 'reactor'),
     'assume_yes': True,
     'force': False,
+    'verbose': False,
 }
 
 _F1 = {