Fixes #6143 - update modules to support RHEL 7