#691 : Increase JNDI lookup compatibility across containers