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

[Jiří Popelka]

Summary of changes:

  3377ab9... revert prnt/hpcups/HPCupsFilter.cpp 3.11.5->3.11.7 change ( (*)
  be89e78... Merge branch 'f14' into f15 (*)
  3da311d... Merge branch 'f15' into f16

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