icinga - retab Apache config template

Change-Id: I32ca5cc75376463d512d1453d2882be75fcb3478
icinga - outdated variable syntax

Change-Id: I9dbd7613a3324b0b4d8330e18260707e28d12d14
Merge "icinga - retab Apache config template" into production
Merge "icinga - outdated variable syntax" into production