Merge of master-melb:xfs-cmds:31032a by kenmcd. Correctly detect if dmapi is present.
Merge of master-melb:xfs-cmds:29445a by kenmcd. New Test