HORNETQ-1047 - JNDI lookups break after failover after failback

git cherry-pick 135b3c28cb7bc9123e06c8de2a5fa023984eaccc