fix for conflict id for disk label, added package for xfs

Change-Id: I6d1ba01efff16d41c5e91973d46aaaa7ea3caca5
1 file changed