Merge changes I1b8e0272,Ia07d0d3b

* changes:
  Write relative paths to name fields in sdump
  Write relative paths to source_file fields in sdump