Merge changes I5fe69642,Ia54ea81f,I6c80f38d

* changes:
  Clean up DumpData-related functions
  Make DropRootUser more container-friendly
  Avoid crashing when a directory does not exist