[upstream] Patch for disabling the dependency on avahi for cups