Merge "Filter out OpenDaylight client on computes"