Hi Brian, I was following #856625 and accidentally duplicated some work of yours. I saw that the RC bug was fixed in the latest upstream release, so I packaged 2.3 and shoved it into the git before I saw you had started working on cherry-picking the patch in. I've rebased my work and pushed it up as UNRELEASED, just in case it is helpful for the future.
The changes are a bit more aggressive -- switching to use upstream's new test methodology -- so I'm not sure if you want to include it in the unblock request. Either way, I'm not going to upload it since I don't want to mess up what you're doing with the unblock. Sorry for accidentally putting my foot into your work! Sincerely, -- Harlan Lieberman-Berg ~hlieberman