Merge "Recover from Throwable in FileRotator, dump." into jb-dev