Merge "Allow dumpstate to call incident CLI"