[DO NOT MERGE] Upstream v2.33.0 with 272df8b

[iwahbe]

This PR exists to show the changes between upstream-v2.33.0-with-272df8b and upstream-v2.33.0. It should never be merged.

The first commit (28b1672) re-applies a previous fix that upstream providers rely on.

93be5f4 is a empty commit.

0c0bf0d fixes a merge issue, reverting the current state of the fork back to upstream. It strictly reduces the change set in our fork.

[VenelinMartinov]

should we revert 8ce6686 too?
Seems like it should be part of the revert now.

[iwahbe]

should we revert 8ce6686 too? Seems like it should be part of the revert now.

I don't think we need to.

terraform-plugin-sdk/helper/schema/resource.go

Lines 588 to 597 in 0c0bf0d

	// UseJSONNumber should be set when state upgraders will expect
	// json.Numbers instead of float64s for numbers. This is added as a
	// toggle for backwards compatibility for type assertions, but should
	// be used in all new resources to avoid bugs with sufficiently large
	// user input. This field is only valid when the Resource is a managed
	// resource.
	//
	// See github.com/hashicorp/terraform-plugin-sdk/issues/655 for more
	// details.
	UseJSONNumber bool

Reverting wouldn't improve our git history nor do we want to take a change there. This part matches upstream.

[VenelinMartinov]

// Fork: We only add this for backward compatibility purposes. This
// bool is not used in any of the codebase and serves only when a resource
// has opted into `UseJSONNumber` in the resource definition. This only
// is in place to allow providers to compile.

This is unlikely to be upstream and now incorrect, right?