Fixes for RHEL/CentOS 7 testing.

Templated test environment now reliably provisions test environment
with RHEL/CentOS 7.