X-Ray-Diffraction Study of Charge-Density-Waves and Oxygen-Ordering in YBa2Cu3O6+x Superconductor