Naming + EJB graceful shutdown improvements