Fix join.mapGroup issue
also fix the issue for regular groups
Merge pull request #1038 from twitter/fixJoinMapGroup

Fix join.mapGroup issue