
Fixes #8196. Maybe. If my theory is correct on how we got there. Also changes the inference of master to be based on the master name, not the node instance prefix. That way if we somehow have a bogus hostname, the master will configure itself as a node, the whole cluster fails, and it's a ton more obvious.