[upstream] Several modifications in CUPS-2.0.0.