Problem/Motivation
The content element describes how and the order in which fields are displayed. This array is sorted by key and a weight is stored. This is a problem because moving fields in field UI will change weights and if the export of two such changes are merged then fields otherwise unchanged will conflict.
Proposed resolution
Do not store the weights. Rather, sort before saving, remove them and add them back on runtime. This makes for a very simple update, too.
This reverts some of #2388867: Notifying user of config changes when config has never been synched makes no sense / e6cd1fa5b7 however this approach also results in a stable config file so the problems fixed there won't reoccur.
Remaining tasks
Write tests, review, commit, party :)
User interface changes
none
API changes
none