Merge pull request #7291 from MrPetovan/bug/2209-update-default-log-location