Merge "Refactor TAPI topology TapiPortMappingListener"