2
I believe this is related to your blocks/templates issue from the upgrade. I have the same issue with blocks not updating.
Once the templates/blocks problem is sorted out, it should be fixed.
PS - Add me to the list of people with duplicate blocks. I had "double main menus" showing up all over the place yesterday.