From Colonias Populares to Urban Villages: Urban Governance and Economic Policies That Shaped Marginal Settlements in Mexico City and Beijing, 1950 – 2000