add errata markers for a lot of recent merges