On the structure of the ortho-II phase of YBa2Cu3O6+x: oxygen ordering and correlated atomic displacements