I solved the problem.

I did not know what to do for the "Forrest configuration
simplification" step because I could not find any text to replace in
site.xml .

I did a recursive grep in my Forrest "src" directory and found that I
had to edit sitemap.xmap instead of site.xml .  Perhaps the upgrade
instructions could be more clear about which files need to be edited?

Brolin