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