JAVA-806

Added JNDI support