Merge "Update default systemd unitfile to include in RPM"