RHEL related fixes

Cherry-picked from Mirantis feature branch (#5)