Instead of using PATCHFILES, handled backported upstream commit as a patch under files/, where it is always available, manageable and where it doesn't break when patch format changes. Pointyhat to: tcberner, jbeich
