FIXME in cluster, see #3192
Merge pull request #1489 from akka/wip-3192-fixme-patriknw

FIXME in cluster, see #3192