Whatever the outcome of the "hardcoded UUIDs in shipped config files" discussion, it will probably require that field.instance.*.yml files stop referencing fields by their uuid. It would make things clearer anyway.
The Entity API cleanups and refactorings that happened since the original "convert Field API to CMI" patch should make that possible now.
