svn - retab Apache template

Change-Id: I09394932886e7de617faecfff95a2f447ee42212
Merge "svn - retab Apache template" into production