Merge pull request #1041 from clebertsuconic/2.2.x

https://issues.jboss.org/browse/HORNETQ-1190 / https://bugzilla.redhat.com/show_bug.cgi?id=960649 forced delivery doesn't work well with slow Consumers
HORNETQ-1202 Fix crash on concurrent modifications.
Notice that just making 'matches' a ConcurrentHashMap does not solve it.
https://bugzilla.redhat.com/show_bug.cgi?id=964129

Tests written for 'master' and 2.3.x branches were not merged as they require
Byteman to run.
Merge pull request #1085 from FranciscoBorges/2.2.x

HORNETQ-1202 Fix crash on concurrent modifications.
HORNETQ-1218 / https://bugzilla.redhat.com/show_bug.cgi?id=959789  Making sure Bridges will reconnect to their proper nodes