This is a spin-off for the first and largest part of #1939994: [META] Complete conversion of nodes to the new Entity Field API.
Patch is the same as in #1939994-59: [META] Complete conversion of nodes to the new Entity Field API except of a merge-conflict left over that was in there.