Merge "Fixes missing type for heat param TenantNetName" into stable/pike