Merge remote-tracking branch 'amb26/FLUID-5117'

* amb26/FLUID-5117:
  FLUID-5117: "expander" left in expanded material fix
  FLUID-5117: Created a test case for FLUID-5117 (http://issues.fluidproject.org/browse/FLUID-5117).
Merge remote-tracking branch 'amb26/FLUID-5126'

* amb26/FLUID-5126:
  FLUID-5126: Fix for "three on a match" listener corruption with repeated demands blocks
Merge remote-tracking branch 'upstream/master' into GPII02beta