You see, the merge team needs to do a better job on making some notes about recent patches. I think they are confusing themselves with a fix that stays on testing and not moved into production or back to experimental during the merge.
So now, you got two kinds of sources. Patches and patches. Okay so maybe problem solved.