MULE-8018: Merge http connector code cleanup

No, I just explained above.