Improvement in client logs at shutdown
Merge pull request #3724 from sancar/ench/clientLogsAtShutDown/maint3.x

Improvement in client logs at shutdown