Make broker respect cartridge id on create

Update model objects atomically
Clean out old references to downloaded_cart_map