Get the old etag from the properties table during filecache upgrade

This should fix the issue of creating a lot of conflict files after upgrading to 5.x

cc @karlitschek @dragotin @MTGap