gerrit - retab apache template

Change-Id: I7740bcb7fd2577a6b167bb0ed97ba50d063f9c75
Merge "gerrit - retab apache template" into production