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.