This is in preparation for using the openstack.common Service classes. Change-Id: I5ac78202199217387b91685e9d0409ae08cc18e0