Merge "Add TrustRepository to provide a source of truth for trust grant changes" into tm-qpr-dev