Merge "remove faulty ONU from the multi OLT tests"