Merge "Clean up remainders of USE_SYSTEMD and logging setup"