Migrate server_roles fixture from old to new code
Merge pull request #936 from jkrocil/fixture-server-role-migrate

Migrate server_roles fixture from old to new code