#691 : Increase JNDI lookup compatibility across containers
(cherry picked from commit 389630d)