Combine netadmin and sysadmin

It's unnecessary to have both netadmin and sysadmin in our
environment. Let's combine them into a single role.

Change-Id: I5cf5ac9600aa44523d4d5a1c3573914ed2da150b