Remove "ContainerAwareTrait" for D11

Closes #3565722

Merge request reports

Loading