In 5.x we allowed this with a deprecation warning. This removes the code added for that deprecation, requiring the cluster name to not be in the data path. Resolves #20391