testing commit 2
Merge branch 'GROUPER_2_2_BRANCH' of https://github.com/internet2/grouper into GROUPER_2_2_BRANCH