Energy dispute runs out of gas as Egypt agrees to boost Jordan's supplies