Merge "TestNetworkManager: add support for configuring tap link addresses"