Merge branch 'fix-typo-json-combo-port' into 'release-20.4'

Fix typo on ObjectModel export json.

See merge request !5573

inv/models/objectmodel.py

@@ -86,7 +86,7 @@ class ObjectModelConnection(EmbeddedDocument):
             "gender": self.gender,
         }
         if self.combo:
-            r["combo"] = self.group
+            r["combo"] = self.combo
         if self.group:
             r["group"] = self.group
         if self.cross: