Merge "cinder: Increase VOLUME_BACKING_FILE_SIZE"