Merge "Restore log colors under devstack/systemd"