Defect ordering in YBa2Cu3O6.5 and YBa2Cu3O6.6: Synthesis and characterization by neutron and electron diffraction