Attempt to fix os-testr based unit tests
Attempt to fix os-testr based unit tests

The os-testr is becoming crazy. Let's see if this fixes it.

Change-Id: I2042877da083370e9a60795722e2e7734c2020ad

stackforge/senlin,openstack/senlin,openstack/senlin,stackforge/senlin,openstack/senlin