Having said that, it's worth noting that the
codebases of the 8.5 and 8.6 filesystem implementations
have diverged, and I lack much confidence that
a patch developed for one can lightly be applied
to the other.

I'd be happier leaving 8.5 untouched, and if that
leaves unfixed bugs, then the fix for them is to
start using 8.6.