Fixed broken repo controller test
Merge pull request #2681 from daviddavis/puppet-merge

Merging in master to the puppet branch