[PATCH v2 0/2] Update mailmap ids