Merge "Fix test_allocate_ips_are_from_correct_subnet on ML2/OVN backend"