Merge branch '2021-07-06-update-to-gcc11-clang11'

- Merge in changes to switch to using gcc-11.1.0 and LLVM-11 in CI.