[1.291 bug] 1. AI over-purchase of mounts 2. AI hero converts before sovereign surrenders

Cross-posting because I put this in the wrong forum initially...

In my current game, I got a sovereign to surrender. When I looked at his equipment list, I saw that he had purchased 6 horses and 6 wargs. That seems a bit much. I don't think he had twelve heros to trade them to.

2. When I captured a city with an AI hero, the hero stayed in the city recovering for 5 turns, and then became part of my faction (It wasn't until many turns later that his sovereign surrendered)