(cherry picked from commit 4747b18d66fafb5699168288b09b7f39da5c2e4e) Conflicts: akka-actor/src/main/scala/akka/actor/ActorSelection.scala project/AkkaBuild.scala