Update handling of default template in dropdown

This change resolves #1013
Before this change, `!customization.upgrade_customization?` was applied to all templates populating the dropdown, except the default template. As a result, if an organization had customized and published an older version of the default template, but not the newest version, that newest version would be blocked from being populated in the dropdown.

app/controllers/template_options_controller.rb

@@ -61,7 +61,7 @@ def index
     # Always use the default template
     if Template.default.present? && org.present?
       customization = Template.published.latest_customized_version(Template.default.family_id, org.id).first
-      customization ||= Template.default
+      customization = Template.default unless customization.present? && !customization.upgrade_customization?
       @templates.select! { |t| t.id != Template.default.id && t.id != customization.id }
       # We want the default template to appear at the beggining of the list
       @templates.unshift(customization)