XX-10872: Restore fix upload restore

-fix selected/uploaded definition ids to be restored
-perform restore in one single step (remove stage method)