propagate fixes from the miniAOD-from710pre5  branch to the 70X one