Merge "Refactor TAPI ConvertORTopoToTapiTopo Junit"