Merge "Adjust APIs for CUPS 2.3.3"