7d5640ee10
When we have a local override, its linked reference may not be detected as needing to be overridden anymore. In that case, if there is no actual override defined by the user, assume that we can get rid of this local override as part of the resync process, and use the linked data directly instead.