Merge PR #28848 into master

* refs/pull/28848/head:
	common/blkdev: only pay attention to first 2 bits of smartctl return code
	common/blkdev: include stdout and stderr on join error
	common/blkdev: fix syntax of error message
	common/blkdev: fix smartctl output in error path
	common/blkdev: include bad json from smartctl when unparseable
	mgr/devicehealth: sort keys when dumping metrics

Reviewed-by: Dan Mick <dmick@redhat.com>