MULE-8018: Merge http connector code cleanup

Will change it.