Merge "BpfCoordinatorTest: renumber the test interface indices"