Fix two RHEL7 tests
Merge pull request #14466 from cro/rhel7_pkgtests

Fix two RHEL7 tests