Fix merge conflicts.
Fix merge conflicts.

Gwendocg/babeldToS,jech/babeld,sudomesh/babeld,boutier/babeld,woniullb/babeld,Gwendocg/babeldToS,jech/babeld,wlanslovenija/babeld,wlanslovenija/babeld,tcatm/babeld,Drooids/babeld,dtaht/babeld-shortrtt-metrics