Adapting the test code to account for changes in heat client code
Adapting the test code to account for changes in heat client code

Change-Id: I19203f70dcc4d0b20ae8b961160b95f8c41109de

stackforge/ospurge,openstack/ospurge,openstack/ospurge