MULE-8018: Merge http connector code cleanup

This needs a JIRA ideally if we are not going to do this now.