[DependencyInjection] fixed tests (refs #7017)
Merge branch '2.0' into 2.1

* 2.0:
  [DependencyInjection] fixed tests (refs #7017)
Merge branch '2.1' into 2.2

* 2.1:
  [DependencyInjection] fixed tests (refs #7017)