Merge "object_storage: retry object creation on Conflict"