Fix issues and upconvert to concrete thrift 2.0.0-SNAPSHOT.