Try another fix for Puppet 2.7 / Facter 1.7.
Merge branch 'feature/fix-remaining-rhel6-scl-issues'