Added rewriting of 19 logs during update to 21
Minor code style fixes in test
Merge pull request #2886 from lutovich/2.1-migration-issue-of-19-logs

2.1 migration issue of 1.9 logs