Merge branch 'feature/newwork' into develop

Author: Frederick Ross

splunklib/binding.py

@@ -700,7 +700,7 @@ def login(self):
             # Then issue requests...
         """
         if self.token is not NoAuthenticationToken and \
-                (self.username and self.password):
+                (not self.username and not self.password):
             # If we were passed a session token, but no username or
             # password, then login is a nop, since we're automatically
             # logged in.

splunklib/client.py

@@ -747,7 +747,7 @@ def _proper_namespace(self, owner=None, app=None, sharing=None):
         This method handles the case of two entities with the same name in different namespaces
         showing up due to wildcards in the service's namespace. We replace the wildcards with the
         namespace of the entity we want.
-        """
+
         :param owner:
         :param app:
         :param sharing: