Update two tests to run on either CentOS or RHEL

Also pick different packages to test with depending on CentOS/RHEL 6 or 7.
identation...