MULE-8018: Merge http connector code cleanup

yes, it was and there's a new test case.