Merge branch 'ticket_345'

Conflicts:
	akka-core/src/test/scala/SchedulerSpec.scala

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

@@ -222,6 +222,7 @@ class RemoteServer extends Logging {
         bootstrap.releaseExternalResources
         Cluster.deregisterLocalNode(hostname, port)
       } catch {
+        case e: java.nio.channels.ClosedChannelException =>  {}
         case e => log.warning("Could not close remote server channel in a graceful way")
       }
     }