Fixed problems with jndiName failing to register properly and failure to properly clean-up and close on application stop or restart.