GR-69  trust relationships

@knutsenm Review GR-70 first. This branch includes GR-70.
entity_types.data_visibility, for consistency