Merge of master-melb:xfs-cmds:28941a by kenmcd. Don't leave trailing whitespace at EOL when filtering output.
Merge of master-melb:xfs-cmds:28456a by kenmcd. mmap vs unwritten extents test.