Canonicalize some remaining references to /apache symlink

Change-Id: Ic9d8837b192d7b84da7f14f59379b3e5d7645462