Merge "Add a keystone-cinder-api constraint"