MULE-8018: Merge http connector code cleanup

Is this get needed?