Merge "Validate restored file paths against their nominal domain" into jb-mr2-dev