Refs #5377 - Fix the repository support class
Merge pull request #4041 from daviddavis/repo-support

Fixing the repo support class