Applied & rebased !831 on top of !898. Addresed all `@todo`s that !898 left...

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

Successor to !831 (closed).

Builds upon !898 (merged).

Closes #3582464

Merge request reports