Merge "Tune OpenDaylight parameters"