[upstream] Patch again CUPS to avoid dependency on Avahi