Fixing one more issue with the defaultHeaders merging and removing unnecessary code

Author: jebentier

modules/swagger-codegen/src/main/resources/python/swagger.mustache

@@ -47,12 +47,9 @@ class ApiClient(object):
     mergedHeaderParams.update(headerParams)
     headers = {}
     if mergedHeaderParams:
-      for param, value in headerParams.iteritems():
+      for param, value in mergedHeaderParams.iteritems():
         headers[param] = ApiClient.sanitizeForSerialization(value)
 
-    if self.headerName:
-      headers[self.headerName] = ApiClient.sanitizeForSerialization(self.headerValue)
-
     if self.cookie:
       headers['Cookie'] = ApiClient.sanitizeForSerialization(self.cookie)