Qatar Set to End Feud With Saudi Arabia