svn - move Apache config from file to template

Change-Id: Ia4b43d88578c6356393f60bd15c01d164fa98ac3
Merge "svn - move Apache config from file to template" into production