apache-frontend: implement hack to render template with two software types

software/apache-frontend/instance-apache-frontend.cfg

@@ -175,7 +175,8 @@ extra-context =
     raw template_slave_configuration ${template-default-slave-virtualhost:target}
     raw empty_template ${template-empty:target}
     raw template_rewrite_cached ${template-rewrite-cached:target}
-    raw software_type default
+    raw software_type default-RootSoftwareInstance
+# XXXX Hack to allow two software types
 
 [dynamic-virtualhost-template-slave]
 <= jinja2-template-base

software/apache-frontend/templates/apache-default-slave-list.cfg.in

-{% if software_type == slap_software_type -%}
+{% if slap_software_type in software_type  -%}
 
 {% set cached_server_dict = {} -%}
 {% set part_list = [] -%}