Merge "Fix numerous FileRepo IDEA warnings"