[hplip/f16] (3 commits) ...Merge branch 'f15' into f16

[Tim Waugh]

Summary of changes:

  5e01868... Corrected IEEE 1284 Device ID for LaserJet M1522nf MFP (bug (*)
  204e2de... Merge branch 'f14' into f15 (*)
  b3046bf... Merge branch 'f15' into f16

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