MDL-23479 backup - various fixes in feedback backup & restore + delete old code ...