Support for reading 2.1 log files and upgrading from 2.1 store files

```assertEquals``` ?