Counterion condensation on charged micelles in an aqueous electrolyte solution as studied with combined small-angle neutron scattering and small-angle x-ray scattering