Update CMS patch (v4)

Add updates from Bill's patch v4:

    ~wmtan/public/root6_patch_v4_for_v6-00-02.patch

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