Revert "merged RootTools 2.6 dev"

This reverts commit d2703f5130f2d1ef3466f7a8caef75b69a7b0d0d.
Revert "Revert "merged RootTools 2.6 dev""

This reverts commit 5588bb7db7f370bb871eb9e925dfa6ccfcb3a831.
merged 2.6 stable