Merge "dumpstate: fix retention of CAP_SYSLOG after dropping root" into main