THRIFT-2689 (fix)

client: haskell
patch: alisdair sullivan

remove struct from NameConflictTest.thrift that causes problems for
certain backends