Fix a stupid bug in resume-from-S3

Also add the FDO name to some trace messages where is was missing

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>