Merge pull request #451 from puppetlabs/daenney/consolidate-include