Merge "Allow overriding the log path."