Add fixes for dm-flakey

This was prompted by seeing xfstests failures that seem to be due to
dm-flakey being more flakey than intended.