Adjust the keys for config-defined component trees.

Wim Leersrequested to merge
issue/canvas-3582464:3582464-config-component-tree-keys into 1.x

Closes #3582464

Merge request reports