Adding RHEL7 support

DO NOT MERGE