Fix systemd bug
Merge branch 'hotfix/rh7'