cleanup trusts in controllers

Change-Id: I1eff618d1e6cef2eb10ae7e737b0ca0beaca1d4d
remove spurious roles check

Change-Id: Ia4909478703d5fe9fb4fec7377c4030cf67eae7b
Merge "cleanup trusts in controllers"
Merge "remove spurious roles check"