Resolves: rhbz#1938836 - Update gpg key for bcl@redhat.com - Work around a mkswap bug
- Includes all patches except the python2 -> python3 change for test helpers