After seven years of tension, Riyadh and Tehran will reopen embassies and revive a 2001 security agreement.