Use cluster name.
Remove last remnant of local-nodename.
Merge bug25979
Merge in default.