[upstream] Update gnu urls to use an entity.
[upstream] Update kbd URL.