EL7 Fixes for CentOS

@hunner any help in determining why this PR is failing would be great. 2 of the 4 are failing and I removed the versioncmp from before I wasn't reading that correctly. Thanks.