Breakthrough comes after years of unsuccessful talks regarding the Grand Ethiopian Renaissance Dam, which became so heated at times that some feared military conflict