Merge "Add test for admin deleting servers of others"