Merge "Add cinder_available config option."