ISPN-4575 Map/Reduce incorrect results with a non-shared non-tx intermed...

Master only. Dan should review. For more details see https://issues.jboss.org/browse/ISPN-4575
Done @danberindei