Cambodian opposition ends 2-month parliament boycott