Merge virt1000 apache config back into wikitech apache config

Change-Id: I23e4273bce7d50553aceab1fc08b679aa3569037