Also while we're there update an old openstack reference. Change-Id: I475e656404f3383d0733cfb3d106f6562729f79f