[6.x.x] Cleanup Logging#116

adamretter merged 2 commits intodevelop-6.x.xevolvedbinary/elemental:develop-6.x.xfrom

6.x.x/hotfix/cleanup-loggingevolvedbinary/elemental:6.x.x/hotfix/cleanup-loggingCopy head branch name to clipboard