Tweaked timestamp kludge logic in recordUpload2

* This now only does the SELECT FOR UPDATE for the re-upload case

Change-Id: I21b1b0328b6dbfb30f4f0293212515b9ee081778
Merge "Tweaked timestamp kludge logic in recordUpload2"