Merge "Remove outfile option from dumpstate"