[upstream] Expand configuration for Cups.