Merge "Add connectivity test via 2 routers and tenant networks"