master
tests: fix up f_detect_junk and f_detect_xfs
tests: fix expected output for f_detect_junk
misc: use libmagic when libblkid can't identify something
f_detect_junk: avoid dd option oflag=append