Add Address connection argument with the following syntax: Address=host[:port]. Where :port part is optional. When port is not specified, default ODBC port is used.
These changes are needed as a first step for adding failover support in future, when we will be able to specify several nodes in the connection string. E.g. Address=host1:port1|host2:port2|host3:port3..port4.
Do not remove Port and Server arguments just yet.