The Premier League and Manchester City have reached a settlement, drawing a line under their protracted battle over sponsorship regulations.