Merge "Enable l3_ha in neutron config for scenario jobs"