Use guarded path for obsolete files (bug 1060634)

- Update model file_path method
- Add test