Collapsing TODO items for some 2.5.x milestones

mostly because they were inaccurate and splitting them up wasn't adding much value IMHO