diff --git a/contrib/runners/orchestra_runner/functions/__init__.py b/contrib/runners/orchestra_runner/orchestra_functions/__init__.py
similarity index 100%
rename from contrib/runners/orchestra_runner/functions/__init__.py
rename to contrib/runners/orchestra_runner/orchestra_functions/__init__.py
diff --git a/contrib/runners/orchestra_runner/functions/st2kv.py b/contrib/runners/orchestra_runner/orchestra_functions/st2kv.py
similarity index 97%
rename from contrib/runners/orchestra_runner/functions/st2kv.py
rename to contrib/runners/orchestra_runner/orchestra_functions/st2kv.py
index e749e1547f..f28f522687 100644
--- a/contrib/runners/orchestra_runner/functions/st2kv.py
+++ b/contrib/runners/orchestra_runner/orchestra_functions/st2kv.py
@@ -43,8 +43,6 @@ def st2kv_(context, key, decrypt=False):
     except Exception as e:
         raise Exception('Failed to retrieve User object for user "%s" % (username)' % (str(e)))
 
-    LOG.debug('ST2KV Decrypt: %s', decrypt)
-
     kvp = kvp_util.get_key(key=key, user_db=user_db, decrypt=decrypt)
 
     if not kvp:
diff --git a/contrib/runners/orchestra_runner/setup.py b/contrib/runners/orchestra_runner/setup.py
index b4028cf737..ef48ee58bc 100644
--- a/contrib/runners/orchestra_runner/setup.py
+++ b/contrib/runners/orchestra_runner/setup.py
@@ -50,7 +50,7 @@
             'orchestra = orchestra_runner.orchestra_runner',
         ],
         'orchestra.expressions.functions': [
-            'st2kv = functions.st2kv:st2kv_',
+            'st2kv = orchestra_functions.st2kv:st2kv_',
         ],
     }
 )
diff --git a/contrib/runners/orchestra_runner/tests/unit/test_expr_func_st2kv.py b/contrib/runners/orchestra_runner/tests/unit/test_expr_func_st2kv.py
index 3e6fe1c746..98506c667d 100644
--- a/contrib/runners/orchestra_runner/tests/unit/test_expr_func_st2kv.py
+++ b/contrib/runners/orchestra_runner/tests/unit/test_expr_func_st2kv.py
@@ -23,7 +23,7 @@
 import st2tests.config as tests_config
 tests_config.parse_args()
 
-from functions import st2kv
+from orchestra_functions import st2kv
 from orchestra import exceptions as exc
 
 from st2common.constants import keyvalue as kvp_const
diff --git a/st2client/st2client/base.py b/st2client/st2client/base.py
index 6ee204210a..1e01885160 100644
--- a/st2client/st2client/base.py
+++ b/st2client/st2client/base.py
@@ -153,7 +153,7 @@ def get_client(self, args, debug=False):
 
         return client
 
-    def _get_config_file_options(self, args, validate_config_permissions=True):
+    def _get_config_file_options(self, args, validate_config_permissions=False):
         """
         Parse the config and return kwargs which can be passed to the Client
         constructor.
@@ -168,7 +168,7 @@ def _get_config_file_options(self, args, validate_config_permissions=True):
 
         return result
 
-    def _parse_config_file(self, args, validate_config_permissions=True):
+    def _parse_config_file(self, args, validate_config_permissions=False):
         config_file_path = self._get_config_file_path(args=args)
 
         parser = CLIConfigParser(config_file_path=config_file_path,
diff --git a/st2client/st2client/commands/keyvalue.py b/st2client/st2client/commands/keyvalue.py
index 4c8ae5fb58..e681d20aae 100644
--- a/st2client/st2client/commands/keyvalue.py
+++ b/st2client/st2client/commands/keyvalue.py
@@ -148,7 +148,7 @@ def run(self, args, **kwargs):
 
 
 class KeyValuePairSetCommand(resource.ResourceCommand):
-    display_attributes = ['name', 'value', 'expire_timestamp']
+    display_attributes = ['name', 'value', 'scope', 'expire_timestamp']
 
     def __init__(self, resource, *args, **kwargs):
         super(KeyValuePairSetCommand, self).__init__(
diff --git a/st2client/tests/unit/test_shell.py b/st2client/tests/unit/test_shell.py
index aca0a0acc2..ece76fa250 100644
--- a/st2client/tests/unit/test_shell.py
+++ b/st2client/tests/unit/test_shell.py
@@ -463,6 +463,7 @@ def _write_mock_package_metadata_file(self):
 
         return package_metadata_path
 
+    @unittest2.skipIf(True, 'skipping until checks are re-enabled')
     @mock.patch.object(
         requests, 'get',
         mock.MagicMock(return_value=base.FakeResponse("{}", 200, 'OK')))
diff --git a/st2common/st2common/util/keyvalue.py b/st2common/st2common/util/keyvalue.py
index 3055bd8e60..1b4ddc719e 100644
--- a/st2common/st2common/util/keyvalue.py
+++ b/st2common/st2common/util/keyvalue.py
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 from __future__ import absolute_import
 import six
 import logging
@@ -99,7 +98,9 @@ def get_key(key=None, user_db=None, scope=None, decrypt=False):
     scope, key_id = _derive_scope_and_key(key=key, user=user_db.name, scope=scope)
     scope = get_datastore_full_scope(scope)
 
-    LOG.debug('get_key scope: %s', scope)
+    LOG.debug('get_key key_id: %s, scope: %s, user: %s, decrypt: %s' % (key_id, scope,
+                                                                        str(user_db.name),
+                                                                        decrypt))
 
     _validate_scope(scope=scope)