Somalia and Ethiopia have agreed to restore diplomatic relations after a year-long rift caused by