MULE-8018: Merge http connector code cleanup

URI/URL here as well..?