Fix a few more places to use cmsys::[io]fstream instead of std::fstream.
Merge topic 'encoding-fstream' into next

42e39bb3 Fix a few more places to use cmsys::[io]fstream instead of std::fstream.