Fix bug 1021917: update snapshot/restore for new build/deployment