Resolution of the discrepancies concerning the optical and microwave values for B0 and D0 of the X state of O2