!con #16123 Expand cluster roles support in ClusterSharding
Merge branch 'entryRoleOverride-#16123' of github.com:rmarsch/akka into entryRoleOverride-#16123

Conflicts:
	akka-contrib/src/main/scala/akka/contrib/pattern/ClusterSharding.scala