The end of a prolonged legal battle between the mayor’s office and the City Council over an expensive housing voucher program known as CityFHEPS was baked into the city’s colossal $125 billion budget, which was passed by the Council late Tuesday.