FLUID-5132: Fix and test adjustment to allow general configuration to be passed to IoC testing framework
FLUID-5132: Clarified implementation comment
Merge remote-tracking branch 'amb26/FLUID-5132'

* amb26/FLUID-5132:
  FLUID-5132: Clarified implementation comment
  FLUID-5132: Fix and test adjustment to allow general configuration to be passed to IoC testing framework
Merge branch 'master' into FLUID-5131