Fixes #6798
(cherry picked from commit 7e20c95)
More clear output in case one log file could not be found
(cherry picked from commit c824a2e)
Merge remote-tracking branch 'origin/master'