rhel7/systemd fixes
cleanup
change to versioncmp
rm trailing whitespace
Merge pull request #156 from ves/systemd_rhel7

rhel7/systemd fixes