Merge pull request #38792 from hashicorp/jbardin/update-go-cty