master
Import from cms-nanoAOD/nanoAOD-tools 6535998, with small updates for py3
Fix tree onership issue