Merge of master-melb:xfs-cmds:30689a by kenmcd. Force the agcount to 6 to keep behaviour the same as old and new
Merge of master-melb:xfs-cmds:29273a by kenmcd. New Test