Merge pull request #2137 from craigcomstock/ent-13763-rhel-8-build-host

Merge pull request #2137 from craigcomstock/ent-13763-rhel-8-build-host #163