Add a temporary feature flag for server-per-node
Use the unadulterated node name in server name

BugzID: 18215