contint-use apache::site,move config to templates

for doc, integration etc.

use the newer apache::site method to setup
the Apache sites

move the files to templates (like one of them already is)
for consistency

Change-Id: I2b7b51ac1d8096d868c63d84c577df8afecc4840
Merge "contint-use apache::site,move config to templates" into production