Merge pull request #6426 from JosJuice/filemonitor-store-offset FileMonitor: Store last file offset instead of path
