Adding 'staff' attribute to v2 user and removing 'type' attribute (only defined for v3 User).
Adding 'staff' attribute to v2 user and removing 'type' attribute (only defined for v3 User).

AEgan/kappa,schmich/kappa