MULE-8018: Merge http connector code cleanup

makes sense. will change it.