Rebase on centos-systemd