Merge pull request #2174 from mwhahaha/MODULES-11075
(MODULES-11075) Improve future version handling for RHEL