Make fileChangedOk a little more sane

It no longer uses this.upload, which is a nice start...

Change-Id: I0cc3754f27f867a618af33bdcefe780d35c1ed89
Merge "Make fileChangedOk a little more sane"