Updated openstack/openstack
Project: openstack/heat  9c74cfe71a73f1ac994bf65f7b0b2e8598ae4e6a

Unit tests: Name resources the same as in template

We were creating a bunch of resources with a different name from their
definition in the template. This makes the data consistent.

Change-Id: Ibfaaea5077a4a97dc45b84d4d25bbba6a78425bf