Merge "Conductor to OFPManager dependency"