Adjust the keys for config-defined component trees.

Closes #3582464

Merge request reports

Loading