Rollout scoped enum as union type to thrift/test

Rollout scoped enum as union type to thrift/test #11621