Additional logging cleanup and handling of OperationRemoteError on metrics gathering (ON-754)