Issue #2982183 by phenaproxima, neclimdul: Follow-up Conflict between TypedDataManager and TypedConfigManager in ConfigEntityAdapter (cherry picked from commit 6c8526b0)