Initial addition of groups to user/policy
Merge pull request #2969 from liggitt/policy_groups

Initial addition of groups to user info and policy