Scaling of the vortex-liquid resistivity in optimally doped and oxygen-deficient YBa 2 Cu 3 O 7-δ single crystals