Update apache2 to use the os-apply-config dir.

Change-Id: I4b613f440424f28cd8d91cb508459926d327119a
Merge "Update apache2 to use the os-apply-config dir."