cleanup trusts in controllers

Change-Id: I1eff618d1e6cef2eb10ae7e737b0ca0beaca1d4d
Fix folsom -> grizzly role table migration issues (bug 1119789)

Change-Id: Id7e5b3354d9139afa0a69b283924f363847cef56
remove spurious roles check

Change-Id: Ia4909478703d5fe9fb4fec7377c4030cf67eae7b
Merge "Fix folsom -> grizzly role table migration issues (bug 1119789)"
Revert "from tests import"

This reverts commit d8599dcda06514a9687af3f714e55ff7580af9db.

Change-Id: Iddb881070a91b9761a567a7d3b6d906e228af9f6
Revert "update tests/__init__.py to verify openssl version"

This reverts commit 72ec89ba301af203ae956bfc84eca19e4919cf24.

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