trunk-tracking: update apache_system_test for minor changes in r3369 and r3374