Keep userspace packaging in sync, portability changes and dmapi headers. Merge of xfs-cmds-melb:slinx:19611a by kenmcd.