server_role de-fixturized into util
Merge pull request #375 from dajohnso/server_roles

server_role de-fixturized into util