Changes to support overriding mega menus in Canada & other plugins; missing templates for Admin, Org, and Package pages; other fixes for some outstanding issues