getByToken migration
Merge branch '7_0_0_dev' of https://github.com/cmstas/NtupleMaker into 7_0_0_dev