Updated handling of jndi names