(maint) Updated RHEL7 support in 1.5.x branch

These changes should fix packaging for RHEL7 and allow RPMs to
be cleanly assembled again.
Merge pull request #881 from mckern/1.5.x

(maint) Updated RHEL7 support in 1.5.x branch