Update maintainers list according to renames made in rev 21284 and 22109