According to Pablo Hidalgo the RO “ending never changed”;
http://www.starwarsnewsnet.com/2016/12/pablo-hidalgo-clarifies-bits-about-rogue-one-a-star-wars-story.html
A bit odd, considering all the trailer shots suggesting a very different ending, but I’m guessing that he’s simply referring to the overall fates of the characters.