2.1.3+portage-1.0.13: Fix bugs with organization templates listings

When choosing an organization that had a customized version of the
default template, the system showed both the detault template and the
organization customized version.

The system now shows the institutional templates that were removed due
to the changes in new plan view.