[pull] master from Azure:master

src/sonic-bgpcfgd/setup.py

@@ -18,7 +18,6 @@
         'jinja2>=2.10',
         'netaddr==0.8.0',
         'pyyaml==5.3.1',
-        'zipp==1.2.0', # importlib-resources needs zipp and seems to have a bug where it will try to import too new of a version for Python 2
     ],
     setup_requires = [
         'pytest-runner',

src/sonic-config-engine/setup.py

@@ -30,7 +30,8 @@
         'future',
         'Jinja2<3.0.0',
         'pyangbind==0.6.0',
-        'zipp==1.2.0', # importlib-resources needs zipp and seems to have a bug where it will try to install too new of a version for Python 2
+        'zipp==1.2.0',  # importlib-resources needs zipp and seems to have a bug where it will try to install too new of a version for Python 2
+        'importlib-resources==3.3.1'  # importlib-resources v4.0.0 was released 2020-12-23 and drops support for Python 2
     ]