Merge pull request #746 from jmaas/release24

Revert "Fix RPM packaging on EL5"
Fix for scraping modules from real boot.cfg
Updated to support scraping modules from real boot.cfg
Updated to support scraping modules from real boot.cfg
Updated to support scraping modules from real boot.cfg
Need regex module for previous commit.