SetAttribute* methods are not returning new Attribute

[jfremy]

The SetAttribute* methods are supposed to return the considered attribute (new or existing) However, because of the variable shadowing in the creation path, it does not return the new Attribute and instead return nil

Fix the code to return the create Attribute when it is not already present in the body

[hashicorp-cla]

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes

_{Have you signed the CLA already but the status is still pending? Recheck it.}