Match config.xml overrides with vendor overlay and vice versa