FLUID-5029: Corrected matching for child selector ">", tidied IoC tests a little
FLUID-5012: Corrected merge conflict in IOC tests

Merge branch 'master' into FLUID-5029

Conflicts:
	src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
Merge remote-tracking branch 'amb26/FLUID-5029'

* amb26/FLUID-5029:
  FLUID-5029: Corrected matching for child selector ">", tidied IoC tests a little