merge - Use a caching wrapper around eRawFile for tstools instead of FILE*; Remove lseek; (REVERT: 5 patches filepush and rawfile)