[11.x] Fix issue where $name variable in non base config file becomes it's key

[11.x] Fix issue where $name variable in non base config file becomes it's key #7211