Merge "Bug 2347: Minor fixes to correct log output"