Merge pull request #838 from clebertsuconic/Branch_2_2_EAP

https://issues.jboss.org/browse/HORNETQ-1130 Fixing races on update topo...
massive-delete test