test for restore not mapping to prototypes when no-conflict active
test for restore not mapping to prototypes when no-conflict active


Former-commit-id: 368a772ca486d8f43bf2c50d7773aad09b780d36 [formerly d2956db2f9518a2274b340764b3c606d1803876e]
Former-commit-id: 5c712d2ddf931e31d96df5c81642d0870b82f9aa
andrewplummer/Sugar,romancow/Sugar,romancow/Sugar,andrewplummer/Sugar