Make this test check for diff packages on RHEL/Centos 6 vs 7
Make this test check for diff packages on RHEL/Centos 6 vs 7
Merge branch 'rhel7_pkgtests' of https://github.com/cro/salt into cro-rhel7_pkgtests
TABS?!?!? Really @cro ??
Merge branch 'cro-rhel7_pkgtests' into 2014.7
Merge pull request #14493 from thatch45/2014.7

Merge #14475 with lint fixes
Merge branch '2014.7' into develop