Merge FieldDescription and handle CustomFields

* Assume that configuration nodes from the old config
  which don't match are custom
* Merge the tree in an order retaining way

Change-Id: I02fcb5a157d9e9574d5ba56ce02878a2f57d5ba0