[Issue 9275] New: Replace all references to master/slave with appropriate terminology