Use forked pl-apache while waiting for merge

(cherry picked from commit 3a0758595e3e6067ac1e5ed687a35761eb343723)
Fix missing comma

(cherry picked from commit 66603e7679acb284c3cf06112ff596e1954bc3aa)
Use commited apache fix instead of our fork

(cherry picked from commit f9aba33056e3c9202de8d990f9b868da5113b842)