Fix Shib authN for grouper
Merge branch 'master' into entityids