OK I think this should be straightforward compared to patch514.
Following Ganesh's proposal that we don't merge 2.5.1 into HEAD, I think
it's just a matter of applying both versions of the patches to their
respective branches.
(Hoping we can get this patch514, patch517, and patch528 mess sorted
with HEAD once and for all...)