Bug 12479 - [SIGNED-OFF] Update mailmap for master