Merge pull request #1045 from clebertsuconic/2.3.x

Fixing deadlock between activation and jmsServer.stop
bridge failover tests