Merge "Extend dumpstate.dry_run restrictions"