Make client_integration_id required.

Also add entity_type_id to system_entities to make
it easier to enforce a unique index.