Apply Bill's patch (~wmtan/public/root6_patch_v1_for_v6-00-02.patch)

Signed-off-by: David Abdurachmanov <David.Abdurachmanov@cern.ch>