Ethiopia and Egypt are in the middle of diplomatic rapprochement to narrow their differences over the construction of a multi-billion hydroelectric dam on the Nile.