Fixes #6202,BZ1085494 - Fix legacy_search for PuppetModule
Merge pull request #4261 from daviddavis/temp/20140612150554

Fixes #6202,BZ1085494 - Fix legacy_search for PuppetModule