Total, ConocoPhillips complete acquisition of Waha stake