Merge "test_l3_agent_scheduler: remove workaround code for Liberty"