Issue with cbq connections to external addresses

From MB-45809

By default for external addresses and cbq we always connect to the internal query port on that machine. This means if there were multiple nodes in the cluster we do not connect to those or round robin across those.
Even though we have always supported external addresses, a change introduced later has caused the first issue. The second issue has always been there so that needs to be improved.

This issue is to address the second point, namely round-robin connections.