Expose private CUPS 1.6 structures.
Merge branch 'fix_cups_16_issue'