Deal ends lockout days before hockey season is canceled