South Sudan President Salva Kiir and rival Riek Machar to meet in Addis Abeba