MULE-8018: Merge http connector code cleanup

Whats you opinion @pablokraan?