Merging container contributions can break commands/events

[amisevsk]

Description

Given a devfile such as the che-code-latest.yaml sample, DWO will merge the che-code-runtime-description component into the tools container. However, this process can result in an invalid devfile, if the contribution component has commands that reference the now-merged component.

Instead, when merging a container contribution into another component, DWO should update and commands in the flattened devfile that reference that component to instead reference the merged component.

How To Reproduce

Apply a DevWorkspace that has a contribution with both

• The controller.devfile.io/container-contribution: true attribute on a component, and
• A command that references this component

Additional context

This issue breaks e.g. prestart and poststart commands for components with controller.devfile.io/container-contribution: true.