Merge "Use working tree iterator to compare file modes" into stable-2.0