FLUID-5559: Fix and test case for double firing of onTestCaseStart corrupting IoC state
Merge remote-tracking branch 'antranig/FLUID-5559'

* antranig/FLUID-5559:
  FLUID-5559: Fix and test case for double firing of onTestCaseStart corrupting IoC state
Merge branch 'master' into FLUID-5542