Fixing 'and' in puppet module controller
Merge pull request #2825 from daviddavis/temp/20130827173400

Fixing 'and' in puppet module controller
Fixing some source code test failures.