El Paso Electric drops demand charge push as regulators approve solar settlement