Changes associated to builtin_xrootd option