Issue #2224873 by alexpott: Handle a config entity with the same name but different UUID being imported.