Api-paste fixups for cinder