someone thinks osrelease is mandatory grain
Merge pull request #3750 from giantlock/develop

fix conflict with rpm module