Merge branch 'hyperledger:main' into security-fix-testing-ujson-package-upgrade

Author: PatStLouis

.github/workflows/build/Dockerfile.ubuntu-2004

@@ -35,5 +35,5 @@ RUN apt-get update -y && apt-get install -y \
     # Python
     python3-pip \
     rubygems && \
-    gem install --no-document dotenv:2.8.1 fpm:1.14.2 && \
+    gem install --no-document public_suffix:5.1.1 dotenv:2.8.1 fpm:1.14.2 && \
     pip3 install Cython==0.29.36