[7.1] AS7-6266 Jndi cleanup is wrong in -ds.xml deployment