Merge PR #24558 into master

* refs/pull/24558/head:
	pybind/mgr: Fix Python 3 imports in diskprediction & insights

Reviewed-by: Noah Watkins <nwatkins@redhat.com>

.githubmap

@@ -83,3 +83,4 @@ adamemerson Adam C. Emerson <aemerson@redhat.com>
 myoungwon Myoungwon Oh <omwmw@sk.com>
 dillaman Jason Dillaman <dillaman@redhat.com>
 batrick Patrick Donnelly <pdonnell@redhat.com>
+noahdesu Noah Watkins <nwatkins@redhat.com>

src/pybind/mgr/diskprediction/common/__init__.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 import errno
 from functools import wraps
-from httplib import BAD_REQUEST
+from six.moves.http_client import BAD_REQUEST
 import os
 import signal
 

src/pybind/mgr/diskprediction/common/grpcclient.py

@@ -6,8 +6,8 @@ import os
 import time
 
 from . import DummyResonse
-import client_pb2
-import client_pb2_grpc
+from . import client_pb2
+from . import client_pb2_grpc
 
 
 def gen_configuration(**kwargs):

src/pybind/mgr/insights/module.py

@@ -4,7 +4,7 @@ import re
 import threading
 import six
 from mgr_module import MgrModule, CommandResult
-import health as health_util
+from . import health as health_util
 
 # hours of crash history to report
 CRASH_HISTORY_HOURS = 24