[KARAF-2642] Merge jndi feature