Feature/2.8/xrootd backport