Issue #3160664 by alisonjo315, DamienMcKenna, srilakshmier: Replace "master/slave" terminology and other language changes.