Ensure the unit tests are still running against master Openstack

This is a basic maintence patch that compatible enough against
the master Openstack so that the unit tests execute without error.

Change-Id: If57287a75ae8a182ff174e0be69df596889f13cc