MULE-8018: Merge http connector code cleanup

I will make it private though.