Merge "Include project path in --force-sync error message"