[cups] (3 commits) ...Merge branch 'f15'

[Tim Waugh]

Summary of changes:

  39d7e8f... Don't delete job data files when restarted (STR #3880). (*)
  ec3fa10... Merge branch 'f14' into f15 (*)
  8612dba... Merge branch 'f15'

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