Merge of master-melb:xfs-cmds:25962a by kenmcd. Modified to test all quota mount options in single run