The subject line probably says it all, but just to confirm, we won't be supporting 3.11 -> 5.1/trunk upgrades, correct?
If that's correct, I'm going to go ahead and remove v30 and v3X from UpgradeTestBase and deal with the downstream changes in whatever way seems reasonable (without actually removing coverage, etc.).