(cherry picked from commit 2a2caeebd585d6dde53bbca0125e62626f7bae51) Conflicts: akka-cluster/src/main/scala/akka/cluster/Member.scala