Merge "Revert "Temporary turn off l3_ha in ovs/lb master/bobcat jobs""