This addresses issue #20199, if I got it right.  The deprecation and
replacement lists are based on the importlib documentation.