Merge "Add configuration option 'image_conversion_dir' for cinder."