shutdown (and unbind) Remote Server even if the remoteServerThread is not alive

akka-core/src/main/scala/remote/BootableRemoteActorService.scala

@@ -38,11 +38,18 @@ trait BootableRemoteActorService extends Bootable with Logging {
 
   abstract override def onUnload = {
     super.onUnload
-        if (remoteServerThread.isAlive) {
+
     log.info("Shutting down Remote Actors Service")
+
     RemoteNode.shutdown
+
+    if (remoteServerThread.isAlive)
       remoteServerThread.join(1000)
-    }
+
+    log.info("Shutting down Cluster")
     Cluster.shutdown
+
+    log.info("Remote Actors Service has been shut down")
   }
+
 }