Make sure we have complete command output if we actually can't parse it.
Delayed restart of the disk monitor.
More unique atom
Merge bug25855
stable to default