Merge "Replace str(uuid.uuid4) with uuidutils.generate_uuid()"