NA OFI: ensure selected domain matches address format
NA OFI: ensure selected domain matches address format

start adding support for IPv6

mercury-hpc/mercury,mercury-hpc/mercury,mercury-hpc/mercury,mercury-hpc/mercury