Fix regexp in facter to work with non numeric versioning
Fix cleanup