Bz1028517: Fix JNDI errors due to removal of -as from deployment names