Merge "Use next cidr to the configured one in the allowed_address_pair tests"