Merge PR #24798 into master

* refs/pull/24798/head:
	fix python collections module warning for v3.7 and above

Reviewed-by: Kefu Chai <kchai@redhat.com>

diff --cc qa/tasks/mgr/dashboard/helper.py
Simple merge

diff --cc src/pybind/mgr/mgr_module.py
Simple merge

diff --cc src/pybind/rbd/rbd.pyx
index 522db5ac727217899f2de929911f00253e645de6,240aac9af5b9b0ef319e1b822dd3755698ae6eff..796046ba0cb003c4efbab76a5dbb5496e2009ed9
--- 1/src/pybind/rbd/rbd.pyx
--- 2/src/pybind/rbd/rbd.pyx
+++ b/src/pybind/rbd/rbd.pyx
@@@ -23,9 -23,11 +23,12 @@@ from libc.stdint cimport 
  from libc.stdlib cimport realloc, free
  from libc.string cimport strdup
  
- from collections import Iterable
+ try:
+     from collections.abc import Iterable
+ except ImportError:
+     from collections import Iterable
  from datetime import datetime
 +from itertools import chain
  
  cimport rados