Finally have a working ota restore test
Merge pull request #2128 from dimagi/no-tears-shampoo

Finally have a working ota restore test