Fix #372 - Do not create conflicted copies if the client has a newer version of a file, and upstream that file

For future reference, you can save yourself a bunch of work in tests that need a connected client by using https://github.com/mozilla/makedrive/blob/master/tests/lib/util.js#L956-1008 instead of all this manual setup.