Refs #4525: Normalize group content restriction across tools
Merge pull request #5513 from mrclay/4525_fixes

Refs #4525: Normalize group content restriction across tools