Merge pull request #1129 from dell/usr/sapana/25631-logs-enhancement