Update to latest ROOT6
Merge pull request #1164 from ktf/updated-root6

Update to latest ROOT cms-sw/root@6838915f1c73b20f5fc9c27d2292310de43a752d