i kinda think Rin will be revived through edo tensei via obito.
Madara will try to control obito. and obito will use rinne tensei on rin and portion of SA. ( tnj die a hero )
when he asked kabuto to show him to stop ET. I sorta think he wanted it for more then just stopping it ntm showing us...