Merge branch 'master' into linting

Author: Kami

actions/catalog_node.py

@@ -2,18 +2,9 @@
 
 
 class ConsulCatalogNodeAction(action.ConsulBaseAction):
-    def run(self,
-            node,
-            index=None,
-            wait=None,
-            consistency=None,
-            dc=None,
+    def run(self, node, index=None, wait=None, consistency=None, dc=None,
             token=None):
-
-        return (True,
-                self.consul.catalog.node(node,
-                                         index=index,
-                                         wait=wait,
-                                         consistency=consistency,
-                                         dc=dc,
-                                         token=token))
+        node = self.consul.catalog.node(node, index=index, wait=wait,
+                                        consistency=consistency, dc=dc,
+                                        token=token)
+        return (True, node)