[systemd upgrade] merge from devel_systemd branch of RSA