ISPN-3352 - Issues with the M/Rs intermediate cache shut down

https://issues.jboss.org/browse/ISPN-3352

Should also fix some intermittent failures in XyzFourNodesMapReduceTest classes.