ISPN-3281 Deadlock in non-transactional caches during rebalance

If the topology id on the primary owner is greater than the one on the
originator, send the command back to the originator with the higher
topology id.
ISPN-2714 TopologyAwareTwoNodesMapReduceTest.testInvokeMapperCancellation test fails randomly

SimpleTwoNodesMapReduceTest.testInvokeMapperCancellation used a static
counter, replace it with a static map of barriers, keyed with the name of
the actual test class. That way, subclasses like
TopologyAwareTwoNodesMapReduceTest will each use their own barrier, and
they will be able to run in parallel.