MULE-8018: Merge http connector code cleanup

Deleting comments as this is resolved.