NHL, NHLPA Reach Deal to End Lockout