Fixes for AEM 6.1:

[pdunnavant]

• Add new group provider.
• For AEM 6.1+, use group provider within user provider to add user to a group (if provided).