bdfdc92 disable unreliable unit test b456cd8 add back in enum values that were removed so existing usages can deserialize properly (#10166)