Fix "TypeError: group id must be integer" if groupid passed in for group
key
Merge pull request #8139 from peterkh/devel

Fix "TypeError: group id must be integer" if groupid passed in for group key