Merge branch 'master' into orchestrator-fix-rook-cluster-in-name

diff --cc src/pybind/mgr/rook/module.py
index 87c5e87de49218f2f1ab14bda713ba4c866e73e6,6677a10a01483df6f3758c7f31cfcd79622003f7..b11c3293b40cadec378366fb6b4963ac764e935d
--- 1/src/pybind/mgr/rook/module.py
--- 2/src/pybind/mgr/rook/module.py
+++ b/src/pybind/mgr/rook/module.py
@@@ -186,8 -186,8 +186,8 @@@ class RookOrchestrator(MgrModule, orche
  
      def available(self):
          if not kubernetes_imported:
-             return False, "`kubernetes` module not found"
+             return False, "`kubernetes` python module not found"
 -        elif not self._in_cluster():
 +        elif not self._in_cluster_name:
              return False, "ceph-mgr not running in Rook cluster"
  
          try: