MULE-8018: Merge http connector code cleanup

Just because it's more concise IMO, this is minor though so feel free to ignore.