Currently there are a few ways mkfs options are specified in XFSQA:

1) suite wide MKFS_OPTIONS are specified before tests are run
	e.g.
	vimes:/home/fsgqa/kali/xfsqa/xfstests # export MKFS_OPTIONS="-l size=100m"

2) test wide MKFS_OPTIONS are specified during a particular test
	e.g. 119
	export MKFS_OPTIONS="-l version=2,size=1200b,su=64k"

3) mkfs options are appended by a test at mkfs time
	e.g.  083
	_scratch_mkfs_xfs -dsize=$fsz,agcount=$ags  >>$seq.full

(4) Another form of appending is just appending to MKFS_OPTIONS directly
	e.g. 	114:export MKFS_OPTIONS="$MKFS_OPTIONS -i parent=1"
		115:export MKFS_OPTIONS="$MKFS_OPTIONS -i paths=1"

Conflicts between mkfs options specified with method 1 & 3 are common.
960377 	XFSQA 041, 042 - mkfs fails with large log size MKFS_OPTIONS.

This change means if a mkfs fails where mkfs options have been appended by a test (method 3),
The mkfs is retried using only those options defined by the test.

occurances of method 4 (in test 114 & 115) are also changed to use method 3.

$seq.full logs the fact that a mkfs options conflict has occured.
Merge of master-melb:xfs-cmds:28601a by kenmcd.

  append -i parent mkfs option using _scratch_mkfs_xfs -i parent...
  rather than export MKFS_OPTIONS="$MKFS_OPTIONS -i parent=1.
  this avoids mkfs option conflicts

115

@@ -92,8 +92,7 @@ rm -f $here/$seq.full
 echo "mkfs"
 _scratch_mkfs_xfs >>$here/$seq.full 2>&1 \
     || _fail "mkfs scratch failed"
-export MKFS_OPTIONS="$MKFS_OPTIONS -i paths=1"
-_scratch_mkfs_xfs >>$here/$seq.full 2>&1 \
+_scratch_mkfs_xfs -i paths=1 >>$here/$seq.full 2>&1 \
     || _notrun "i_paths not supported"
 
 echo "mount"