Reclassify specific 4.x errors into their 5.x classifications

[fbiville]

Now the fun part begins: builds will have to fail before everything resolves again (once both the driver and testkit PR are merged).