Merge "OpenFlow cluster is only available with Li redesign"