MULE-8018: Merge http connector code cleanup

will do