Bug 1096734: re-add 'include collectd'; a=revert

reverts https://hg.mozilla.org/build/puppet/rev/87ed518b3152
Merge default -> production

--HG--
branch : production