remove another requirement for apache2 package and
fix unquoted resource names and unquoted file modes

Change-Id: I4b4fd5bc285988fb61d55d5274f0cb44e1d57151
Merge "remove another requirement for apache2 package and fix unquoted resource names and unquoted file modes" into production