Don't drop stashed changes after restore

We're seeing a rare bug crop up where a file/directory disappears
between being stashed and being restored.

Change-Id: I2397177be8dadcbab83877dcb3ee8946910b9eed
Reviewed-on: http://gerrit.causes.com/38032
Tested-by: jenkins <jenkins@causes.com>
Reviewed-by: Shane da Silva <shane@causes.com>