apache: fix another merge fail

Change-Id: Ic2f87f571898300df233c95e394fe5d9831bfcfe