How was the Kofi/Orton feud conclusively finished? It wasn't. So no, it doesn't play in perfectly. And again you assume that they didn't plan this ahead in the first place.
Except it lacks logic in it's inception because I guarantee you if they dropped the Kofi/Orton angle for no reason at...