Crystal Structure and Superconductivity Controlled by Cation Substitution and Oxygen Annealing in Y1-xCaxBa2Cu3Oy and YBa2-xLaxCu3Oy