Jordan's electricity strike comes to an end