Set apache as the puppet service name

This will set the apache service to bounce, which will in turn
bounce the puppetmaster, when puppetdb needs to notify the service
to rehash its config.

Change-Id: I2033b42ba246619172f39e09e98d20d702d0156a
Merge "Set apache as the puppet service name"