try changing to use InetAddressUtils and clean up initialization a bit
Merge branch '1.12'
Merge branch 'master' into pull-requests