Fix trustee/trustor definitions

The trustee is the person consuming the trust, the trustor is the person
who creates the trust.

Change-Id: I4d6c4b4f14c0dfcb3b41cd3e37aecd01487442fd
Merge "Fix trustee/trustor definitions"