Merge pull request #1127 from clebertsuconic/2.2.x

 HORNETQ-1224 fix on race on QueueImpl.deliver()
HORNETQ-1184 : Leak on failed RecoveryDiscovery
Merge pull request #1130 from gaohoward/2.2.x

HORNETQ-1184 : Leak on failed RecoveryDiscovery
HORNETQ-1184 second fix: don't register recovery if failed to make connection