National Hockey League lockout ends with concessions contract