(maint) Updated RHEL7 support in 1.5.x branch

These changes should fix packaging for RHEL7 and allow RPMs to be cleanly assembled again.