puppetmaster - retab Apache template

Change-Id: I94c2f4014a6614290e39eb52ec3af9171144faa0
Merge "puppetmaster - retab Apache template" into production