Remove "apache" service duplication
Merge branch 'CHEF_3694_prior_resource_duplication' into merged-fixes

* CHEF_3694_prior_resource_duplication:
  Remove "apache" service duplication
Remove mod_ssl service duplication
Merge branch 'CHEF_3694_prior_resource_duplication_2' into merged-fixes

* CHEF_3694_prior_resource_duplication_2:
  Remove mod_ssl service duplication