revert commits done before MZ holidays

they are all not neccessary for SINQ SE operation

Change-Id: Ic9adcccf685752ab90bb6b86005ac8e04b302855

frappy/lib/__init__.py

@@ -401,15 +401,10 @@ class UniqueObject:
 def merge_status(*args):
     """merge status
 
-    for combining stati of different mixins
-    - the status with biggest code wins
-    - texts matching maximal code are joined with ', '
-    - if texts already contain ', ', it is considered as composed by
-      individual texts and duplication is avoided. when commas are used
-      for other purposes, the behaviour might be surprising
+    the status with biggest code wins
+    texts matching maximal code are joined with ', '
     """
     maxcode = max(a[0] for a in args)
     merged = [a[1] for a in args if a[0] == maxcode and a[1]]
-    # use dict instead of set for preserving order
     merged = {m: True for mm in merged for m in mm.split(', ')}
     return maxcode, ', '.join(merged)