Post Merge fix: Add missing changes

stack/erp5/instance.cfg.in

@@ -73,19 +73,8 @@ extra-context =
     key local_bt5_repository dynamic-template-erp5-parameters:local-bt5-repository
     import urlparse urlparse
     key openssl_location :openssl-location
-# Must match the key id in [switch-softwaretype] which uses this section.
-    key software_type :software-type
-software-type = default
 openssl-location = {{ openssl_location }}
 
-[dynamic-template-erp5-RootSoftwareInstance]
-< = dynamic-template-erp5
-software-type = RootSoftwareInstance
-
-[dynamic-template-erp5-create-erp5-site]
-< = dynamic-template-erp5
-software-type = create-erp5-site
-
 [dynamic-template-balancer-parameters]
 apache = {{ apache_location }}
 openssl = {{ openssl_location }}