[hplip/f15] When copying Device IDs from hpcups to hpijs, use ModelName as the key instead of ShortNickName (bug

[Tim Waugh]

Summary of changes:

  9ae4f5d... When copying Device IDs from hpcups to hpijs, use ModelName (*)

(*) This commit already existed in another branch; no separate mail sent