Merge "Test creating router setting tenant_id"