Merge change 23693 into eclair

* changes:
  dumpstate: Add option to output to socket, disable code that switched to nonroot