Replace the direct class applications of collectd with the role/profile version.
Add more Apache modules in the Apache profile.
Change Apache class applications to the role/profile version.