MULE-8018: Merge http connector code cleanup

These githhub comments ;-) To clean things up a bit here..