Updated for 12 November beta patch

(CB fix for viceroyalties was already implemented in a different way so
I left it alone)