MDL-43749 Fix backup and reastore, master->master.