Include collection entity type in /ws/2, so it can be used for filtering by clients.
Merge branch 'collection-entity-type' into beta

* collection-entity-type:
  Include collection entity type in /ws/2, so it can be used for filtering by clients.