Remove references to Fn::GetAtt.

These were causing a Circular dependency error during the
creation of a stack.

Change-Id: Iccdf4a081f38aa3a5fe0e250b9e9382958a0f26e
Merge "Remove references to Fn::GetAtt."