OCF merges with AllSeen to create a single IoT discovery body