Merge "Don't try to split localhost log lines" into feature/zuulv3