MULE-8018: Merge http connector code cleanup

You know I'd use InetSocketAddress, but at long as the ip/host issue is taken into account thats the main thing :-)